Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Elaborated instructions for branching #2168

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −4
Draft

Elaborated instructions for branching #2168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,28 @@ This repository follows the same version numbering and release branching schedul

### Branching

1. Create a new 'release-x.y' branch and push it into Git
2. Advance the CI configuration in openshift/release to create new lanes for the release branch and move the master along to the next release version number
1. Before creating a new `release-x.y` branch ensure the new `x.y`version is reflected in the following sources:
- `cnf-tests/dockerfile.openshift`:
1. Check image tags used.
2. `CNF_TESTS_IMAGE` and `DPDK_TESTS_IMAGE` variables tags.

- `cnf-tests/Dockerfile.konflux`:
1. Check image tags used.
2. `CNF_TESTS_IMAGE` and `DPDK_TESTS_IMAGE` variables tags.
3. Check the tags in the strings of `RUN sed` commands.

- `cnf-tests/mirror/images.json`
- `cnf-tests/testsuites/pkg/images/images.go`
- `hack/common.sh`

2. If any sources require updates, create a pull request against the master branch with the necessary changes. Merge this PR before proceeding to the next steps.
2. Create a new `release-x.y` branch and push it to git
3. Advance the CI configuration in openshift/release to create new lanes for the release branch and move the master along to the next release version number
- Example: https://github.com/openshift/release/pull/26172
3. Change the ZTP templates examples label `du-profile: latest` under [gitops-subscriptions/argocd/example](https://github.com/openshift-kni/cnf-features-deploy/tree/master/ztp/gitops-subscriptions/argocd/example) to match the branch release-x.y
4. Change the ZTP templates examples label `du-profile: latest` under [gitops-subscriptions/argocd/example](https://github.com/openshift-kni/cnf-features-deploy/tree/master/ztp/gitops-subscriptions/argocd/example) to match the branch release-x.y
- PGT Example: https://github.com/openshift-kni/cnf-features-deploy/pull/1063
- SiteConfig Example: https://github.com/openshift-kni/cnf-features-deploy/pull/1064
4. Pin all midstream branches to the new release branch, and create new midstream branches for the next release
5. Pin all midstream branches to the new release branch, and create new midstream branches for the next release
- [cnf-tests](https://code.engineering.redhat.com/gerrit/admin/repos/cnf-tests)
- [ztp-site-generate](https://code.engineering.redhat.com/gerrit/admin/repos/ztp-site-generate)
6. Create a PR to the master branch updating the references from the first step to version `x.y+1`