Skip to content

Commit 146b126

Browse files
authored
ROX-31200: Sync Konfluxbot config (#2457)
Sync Konfluxbot config
1 parent 4f6fe68 commit 146b126

File tree

1 file changed

+34
-20
lines changed

1 file changed

+34
-20
lines changed

.github/renovate.json5

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,29 @@
1717
// This tells Renovate to combine all updates in one PR so that we have fewer PRs to deal with.
1818
"group:all",
1919
],
20+
// The number of PRs that can be open against the repo.
21+
"prConcurrentLimit": 20,
22+
// `null` means the branch limit should be the same as PR limit.
23+
"branchConcurrentLimit": null,
24+
// The number of PRs MintMaker can open in one hour, effectively in one run.
25+
"prHourlyLimit": 4,
2026
"timezone": "Etc/UTC",
2127
"schedule": [
22-
// This controls when Renovate can create new branches and open PRs.
2328
// Allowed syntax: https://docs.renovatebot.com/configuration-options/#schedule
29+
// This is a "general" schedule for managers that don't declare their own.
2430
// The time was selected (with the help of https://time.fyi/timezones) so that Renovate isn't active during business
25-
// hours from Germany to US West Coast. This way, we limit the number of changes Renovate can merge to one per day.
26-
"after 3am and before 7am",
31+
// hours from Central Europe to US West Coast. This way, after we merge a PR, a new one does not pop up immediately
32+
// after that.
33+
// Between 3a.m. and 7a.m. every day.
34+
"* 3-7 * * *",
2735
],
28-
// Tell Renovate that it can rebase and update its branches (and/or its PRs) at times outside the `schedule`.
29-
"updateNotScheduled": true,
36+
// Tell Renovate not to update PRs when outside schedule.
37+
"updateNotScheduled": false,
3038
"tekton": {
31-
"includePaths": [
32-
".tekton/**",
33-
],
3439
"schedule": [
35-
// For some reason, Konflux config defines custom schedule on each type of dependency manager and that takes
36-
// precedence over the global/default schedule. We want our own schedule and hence need to make this override.
37-
"after 3am and before 7am",
40+
// Between 3a.m. and 7a.m. every day.
41+
// We duplicate our desired schedule here because Konflux global config tends to have a special override for it.
42+
"* 3-7 * * *",
3843
],
3944
"packageRules": [
4045
// Note: the packageRules from the Konflux config (find URL in comments above) get merged with these.
@@ -45,17 +50,26 @@
4550
],
4651
},
4752
],
48-
"automerge": true,
49-
// PRs can't be actually automerged because we require approval from CODEOWNERS which Renovate can't bypass,
50-
// therefore, we set automerge type to branch.
51-
"automergeType": "branch",
52-
"automergeStrategy": "squash",
53-
// Tell Renovate that it can automerge branches at any time of the day.
54-
"automergeSchedule": [
55-
"at any time"
56-
],
5753
},
5854
"enabledManagers": [
55+
// Restrict Konflux bot focus on Konflux things since we rely on GitHub's dependabot for everything else.
5956
"tekton",
6057
],
58+
"packageRules": [
59+
{
60+
"matchPackageNames": [
61+
"*",
62+
],
63+
"groupName": "All updates",
64+
"automerge": true,
65+
// A known issue is that some non-Konflux CI jobs currently fail, which may prevent successful auto-merging with a "branch" auto-merge setting.
66+
// Therefore, we use PR merge type and have automation approve PRs.
67+
"automergeType": "pr",
68+
"automergeStrategy": "squash",
69+
// Tell Renovate that it can automerge branches at any time of the day.
70+
"automergeSchedule": [
71+
"at any time",
72+
],
73+
}
74+
],
6175
}

0 commit comments

Comments
 (0)