Skip to content

Commit deb70e7

Browse files
committed
templates/rebase: update steps to update build-args.conf
We've moved more and more stuff into build-args.conf and we don't need to update the manifest for a lot of these steps now.
1 parent 10cbb19 commit deb70e7

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

.github/ISSUE_TEMPLATE/rebase.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,20 @@ Example PR: https://github.com/coreos/coreos-installer/pull/1113
9191

9292
### Update `rawhide` stream
9393

94-
- [ ] Update [manifest.yaml](https://github.com/coreos/fedora-coreos-config/blob/rawhide/manifest.yaml) to list N+1 as the releasever ([example PR](https://github.com/coreos/fedora-coreos-config/pull/2855))
94+
- [ ] Update `VERSION`, `MUTATE_OS_RELEASE`, `BUILDER_IMG` in [build-args.conf](https://github.com/coreos/fedora-coreos-config/blob/rawhide/build-args.conf) ([example PR](https://github.com/coreos/fedora-coreos-config/pull/4003))
9595

9696
### Enable `branched` stream
9797

98-
- [ ] Update [manifest.yaml](https://github.com/coreos/fedora-coreos-config/blob/branched/manifest.yaml) to list N as the releasever ([example PR](https://github.com/coreos/fedora-coreos-config/pull/2549))
98+
- [ ] Update `VERSION`, `MUTATE_OS_RELEASE`, `BUILDER_IMG` in [build-args.conf](https://github.com/coreos/fedora-coreos-config/blob/branched/build-args.conf) ([example PR](https://github.com/coreos/fedora-coreos-config/pull/4005))
9999
- [ ] Update [config.yaml](https://github.com/coreos/fedora-coreos-pipeline/blob/main/config.yaml) to un-comment out the `branched` stream definition ([example PR](https://github.com/coreos/fedora-coreos-pipeline/pull/904))
100100

101101
## At Fedora (N) Beta
102102

103103
### Update [fedora-coreos-config](https://github.com/coreos/fedora-coreos-config/) `next-devel`
104104

105-
- [ ] Bump `releasever` in `manifest.yaml`
105+
- [ ] Bump `VERSION`, `MUTATE_OS_RELEASE`, `BUILDER_IMG` in `build-args.conf`
106106
- [ ] Add the `fedora-candidate-compose` repo in `manifest.yaml` ([example PR](https://github.com/coreos/fedora-coreos-config/pull/2706))
107107
- [ ] Update the repos in `manifest.yaml` if needed
108-
- [ ] Bump the Fedora version and `BUILDER_IMG` tag in `build-args.conf`
109108
- [ ] Run `cosa fetch --dry-run --update-lockfile`
110109
- this updates the x86_64 lockfile - the others will get updated when `bump-lockfile` runs.
111110
- in the future we may support [this](https://github.com/coreos/coreos-assembler/issues/3088) in `cosa fetch` directly
@@ -138,12 +137,11 @@ If the packages in `next-devel` don't exactly match the last `next` release that
138137

139138
### Update [fedora-coreos-config](https://github.com/coreos/fedora-coreos-config/) `testing-devel`
140139

141-
- [ ] Bump `releasever` in `manifest.yaml`
140+
- [ ] Bump `VERSION`, `MUTATE_OS_RELEASE`, `BUILDER_IMG` in `build-args.conf`
142141
- [ ] Update the repos in `manifest.yaml` if needed
143142
- [ ] Sync the lockfiles for all arches from `next-devel`
144143
- [ ] Bump the base Fedora version in `ci/buildroot/Dockerfile`
145144
- [ ] Bump the Fedora version for the test containers in `tests/kola/data/commonlib.sh`
146-
- [ ] Bump the Fedora version and `BUILDER_IMG` tag in `build-args.conf`
147145
- [ ] PR the result
148146

149147

0 commit comments

Comments
 (0)