Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,27 @@ updates:
- "ok-to-test"
## main branch config ends here

## release-34.0 branch config starts here
- package-ecosystem: "github-actions"
directory: "/" # Location of package manifests
schedule:
interval: "monthly"
day: "friday"
target-branch: release-34.0
## group all action bumps into single PR
groups:
github-actions:
patterns: [ "*" ]
ignore:
# Ignore major and minor bumps for release branch
- dependency-name: "*"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
commit-message:
prefix: ":seedling:"
labels:
- "ok-to-test"
## release-34.0 branch config ends here

## release-33.0 branch config starts here
- package-ecosystem: "github-actions"
directory: "/" # Location of package manifests
Expand Down
14 changes: 7 additions & 7 deletions docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,17 @@ If (and only if) you're creating a release `vx.y.0` (i.e. a minor release):
the actual remote name for the upstream source (not your private fork).

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

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

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

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

- Commit your changes, push the new branch and create a pull request:
- The commit and PR title should be
Expand Down Expand Up @@ -199,7 +199,7 @@ updated in the `main` branch to include the new release branch.

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

- Add the new release branch (e.g., `release-32.0`) to the `baseBranchPatterns`
- Add the new release branch (e.g., `release-34.0`) to the `baseBranchPatterns`
array
- Add the new release branch to the `packageRules` section with the daily
schedule configuration matching other release branches
Expand Down Expand Up @@ -231,12 +231,12 @@ Update the [user guide](https://github.com/metal3-io/metal3-docs/tree/main/docs/
in older ironic-image branches.

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

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

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

Milestones must also be updated in the Prow configuration.

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

## Ironic Standalone Operator updates

Expand Down
6 changes: 4 additions & 2 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"main",
"release-31.0",
"release-32.0",
"release-33.0"
"release-33.0",
"release-34.0"
],
"enabledManagers": [
"custom.regex"
Expand Down Expand Up @@ -33,7 +34,8 @@
"matchBaseBranches": [
"release-31.0",
"release-32.0",
"release-33.0"
"release-33.0",
"release-34.0"
],
"description": "run before 6am every day",
"schedule": [
Expand Down
Loading