diff --git a/ISSUE_TEMPLATE/next.md b/ISSUE_TEMPLATE/next.md index 66be1758..e2fc20e6 100644 --- a/ISSUE_TEMPLATE/next.md +++ b/ISSUE_TEMPLATE/next.md @@ -7,9 +7,22 @@ Edit the issue title to include today's date. Once the pipeline spits out the ne ## Promote next-devel changes to next - [ ] Add the `ok-to-promote` label to the issue -- [ ] Review the promotion PR opened by the bot against the `next` branch on https://github.com/coreos/fedora-coreos-config +- [ ] Review the promotion PR against the `next` branch on https://github.com/coreos/fedora-coreos-config - [ ] Once CI has passed, merge it +
+Manual alternative + +Sometimes you need to run the process manually like if you need to add an extra commit to change something in `manifest.yaml`. The steps for this are: + +- `git fetch upstream` +- `git checkout next` +- `git reset --hard upstream/next` +- `/path/to/fedora-coreos-releng-automation/scripts/promote-config.sh next-devel` +- Open PR against the `next` branch on https://github.com/coreos/fedora-coreos-config + +
+ ## Build - [ ] Start a [build job](https://jenkins-fedora-coreos-pipeline.apps.ocp.fedoraproject.org/job/build/) (select `next`, leave all other defaults). This will automatically run multi-arch builds. diff --git a/ISSUE_TEMPLATE/stable.md b/ISSUE_TEMPLATE/stable.md index 40301c42..07b721c7 100644 --- a/ISSUE_TEMPLATE/stable.md +++ b/ISSUE_TEMPLATE/stable.md @@ -7,9 +7,22 @@ Edit the issue title to include today's date. Once the pipeline spits out the ne ## Promote testing changes to stable - [ ] Add the `ok-to-promote` label to the issue -- [ ] Review the promotion PR opened by the bot against the `stable` branch on https://github.com/coreos/fedora-coreos-config +- [ ] Review the promotion PR against the `stable` branch on https://github.com/coreos/fedora-coreos-config - [ ] Once CI has passed, merge it +
+Manual alternative + +Sometimes you need to run the process manually like if you need to add an extra commit to change something in `manifest.yaml`. The steps for this are: + +- `git fetch upstream` +- `git checkout stable` +- `git reset --hard upstream/stable` +- `/path/to/fedora-coreos-releng-automation/scripts/promote-config.sh testing` +- Open PR against the `stable` branch on https://github.com/coreos/fedora-coreos-config + +
+ ## Build - [ ] Start a [build job](https://jenkins-fedora-coreos-pipeline.apps.ocp.fedoraproject.org/job/build/) (select `stable`, leave all other defaults). This will automatically run multi-arch builds. diff --git a/ISSUE_TEMPLATE/testing.md b/ISSUE_TEMPLATE/testing.md index 759f8836..ad7cc0d3 100644 --- a/ISSUE_TEMPLATE/testing.md +++ b/ISSUE_TEMPLATE/testing.md @@ -7,9 +7,22 @@ Edit the issue title to include today's date. Once the pipeline spits out the ne ## Promote testing-devel changes to testing - [ ] Add the `ok-to-promote` label to the issue -- [ ] Review the promotion PR opened by the bot against the `testing` branch on https://github.com/coreos/fedora-coreos-config +- [ ] Review the promotion PR against the `testing` branch on https://github.com/coreos/fedora-coreos-config - [ ] Once CI has passed, merge it +
+Manual alternative + +Sometimes you need to run the process manually like if you need to add an extra commit to change something in `manifest.yaml`. The steps for this are: + +- `git fetch upstream` +- `git checkout testing` +- `git reset --hard upstream/testing` +- `/path/to/fedora-coreos-releng-automation/scripts/promote-config.sh testing-devel` +- Open PR against the `testing` branch on https://github.com/coreos/fedora-coreos-config + +
+ ## Build - [ ] Start a [build job](https://jenkins-fedora-coreos-pipeline.apps.ocp.fedoraproject.org/job/build/) (select `testing`, leave all other defaults). This will automatically run multi-arch builds.