Skip to content

Commit

Permalink
templates: re-add manual steps for config promotion
Browse files Browse the repository at this point in the history
Sometimes we need this and it would be nice to have it accessible
in the templates rather than having to find the steps when you do
need it.
  • Loading branch information
dustymabe authored and jlebon committed Mar 25, 2022
1 parent 5322a1e commit b158f6e
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 3 deletions.
15 changes: 14 additions & 1 deletion ISSUE_TEMPLATE/next.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

<details>
<summary>Manual alternative</summary>

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

</details>

## 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.
Expand Down
15 changes: 14 additions & 1 deletion ISSUE_TEMPLATE/stable.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

<details>
<summary>Manual alternative</summary>

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

</details>

## 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.
Expand Down
15 changes: 14 additions & 1 deletion ISSUE_TEMPLATE/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

<details>
<summary>Manual alternative</summary>

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

</details>

## 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.
Expand Down

0 comments on commit b158f6e

Please sign in to comment.