Skip to content

Commit 902c6d9

Browse files
committed
Update dependabot and renovate config for release-34.0
Also update releasing guide with more recent examples. Signed-off-by: Riccardo Pittau <elfosardo@gmail.com>
1 parent 0fe5a59 commit 902c6d9

File tree

3 files changed

+37
-10
lines changed

3 files changed

+37
-10
lines changed

.github/dependabot.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,27 @@ updates:
2424
- "ok-to-test"
2525
## main branch config ends here
2626

27+
## release-34.0 branch config starts here
28+
- package-ecosystem: "github-actions"
29+
directory: "/" # Location of package manifests
30+
schedule:
31+
interval: "monthly"
32+
day: "friday"
33+
target-branch: release-34.0
34+
## group all action bumps into single PR
35+
groups:
36+
github-actions:
37+
patterns: [ "*" ]
38+
ignore:
39+
# Ignore major and minor bumps for release branch
40+
- dependency-name: "*"
41+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
42+
commit-message:
43+
prefix: ":seedling:"
44+
labels:
45+
- "ok-to-test"
46+
## release-34.0 branch config ends here
47+
2748
## release-33.0 branch config starts here
2849
- package-ecosystem: "github-actions"
2950
directory: "/" # Location of package manifests

docs/releasing.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@ If (and only if) you're creating a release `vx.y.0` (i.e. a minor release):
7070
the actual remote name for the upstream source (not your private fork).
7171

7272
- Setup the CI for the new branch in the prow configuration.
73-
[Prior art](https://github.com/metal3-io/project-infra/pull/976)
73+
[Prior art](https://github.com/metal3-io/project-infra/pull/1237)
7474

7575
Create a development branch (e.g. `prepare-x.y`) from the newly created branch:
7676

7777
- Pin the constraints.
78-
[Prior art](https://github.com/metal3-io/ironic-image/pull/655).
78+
[Prior art](https://github.com/metal3-io/ironic-image/pull/900)
7979

8080
- Pin the `IRONIC_SOURCE` to specific SHA in the upstream release branch. It must
8181
be in format `ARG IRONIC_SOURCE=<sha> # <branch_name>` for Renovate bot to
8282
be able to update it automatically in the future.
83-
[Prior art](https://github.com/metal3-io/ironic-image/pull/771)
83+
[Prior art](https://github.com/metal3-io/ironic-image/pull/900)
8484

8585
- Commit your changes, push the new branch and create a pull request:
8686
- The commit and PR title should be
@@ -189,7 +189,8 @@ If project dependencies have changed, then copy the configuration of `main`,
189189
and adjust the `ignore` rules to match release branches. As generic rule we
190190
don't allow major or minor bumps in release branches.
191191

192-
[Prior art](https://github.com/metal3-io/ironic-image/pull/702)
192+
Prior art: See the PR that added release-34.0 to dependabot configuration
193+
(this change will be the reference once committed).
193194

194195
### Renovate configuration
195196

@@ -199,11 +200,14 @@ updated in the `main` branch to include the new release branch.
199200

200201
Update `renovate.json` in `main` branch:
201202

202-
- Add the new release branch (e.g., `release-32.0`) to the `baseBranchPatterns`
203+
- Add the new release branch (e.g., `release-34.0`) to the `baseBranchPatterns`
203204
array
204205
- Add the new release branch to the `packageRules` section with the daily
205206
schedule configuration matching other release branches
206207

208+
Prior art: See the PR that added release-34.0 to renovate configuration
209+
(this change will be the reference once committed).
210+
207211
### Branch protection rules
208212

209213
Branch protection rules need to be applied to the new release branch. Copy the
@@ -231,12 +235,12 @@ Update the [user guide](https://github.com/metal3-io/metal3-docs/tree/main/docs/
231235
in older ironic-image branches.
232236

233237
- Update `README.md` with release specific information, both on `main` and in the
234-
new `release-X.Y` branch as necessary.
238+
new `release-X.Y` branch as necessary (if applicable).
235239
[Prior art](https://github.com/metal3-io/ironic-image/pull/594)
236240

237241
- In the `release-X.Y` branch, update the build badges in the `README.md` to point
238242
to correct Jenkins jobs, so the build statuses of the release branch are
239-
visible.
243+
visible (if applicable).
240244
[Prior art](https://github.com/metal3-io/ironic-image/pull/595)
241245

242246
### Update milestones
@@ -249,7 +253,7 @@ Update the [user guide](https://github.com/metal3-io/metal3-docs/tree/main/docs/
249253

250254
Milestones must also be updated in the Prow configuration.
251255

252-
[Prior art](https://github.com/metal3-io/project-infra/pull/976).
256+
[Prior art](https://github.com/metal3-io/project-infra/pull/1237)
253257

254258
## Ironic Standalone Operator updates
255259

renovate.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"main",
66
"release-31.0",
77
"release-32.0",
8-
"release-33.0"
8+
"release-33.0",
9+
"release-34.0"
910
],
1011
"enabledManagers": [
1112
"custom.regex"
@@ -33,7 +34,8 @@
3334
"matchBaseBranches": [
3435
"release-31.0",
3536
"release-32.0",
36-
"release-33.0"
37+
"release-33.0",
38+
"release-34.0"
3739
],
3840
"description": "run before 6am every day",
3941
"schedule": [

0 commit comments

Comments
 (0)