diff --git a/RELEASE.md b/RELEASE.md index e11ca1c..fe2f647 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -234,18 +234,17 @@ Add package rules for the new version in `renovate.json`. See the existing rules **Repository:** https://gitlab.com/fedora/infrastructure/konflux/tenants-config ```bash -cd cluster/kfluxfedorap01/bootc-tenant/applications/fedora-bootc/ +cd clusters/kflux-fedora-01/tenants/bootc-tenant/applications/fedora-bootc/ NEW_RELEASE=44 # Copy from rawhide cp -r rawhide $NEW_RELEASE # Update version references -sed -i "s/rawhide/$NEW_RELEASE/g" $NEW_RELEASE/**/*.yaml sed -i "s/compose-rawhide-id/compose-branched-id/" $NEW_RELEASE/releaseplans/release-to-quay-io/kustomization.yaml +find "${NEW_RELEASE}/" -type f | xargs sed -i "s/rawhide/$NEW_RELEASE/g" ``` -#### Step 5: Register the New Version (tenants-config repo) Add the new version to `fedora-bootc/kustomization.yaml`: @@ -259,6 +258,8 @@ resources: - "42" ``` +See [MR !237](https://gitlab.com/fedora/infrastructure/konflux/tenants-config/-/merge_requests/237) for reference (F45 addition). + ### Removing an EOL Fedora Version from Konflux When a Fedora version reaches EOL (e.g., F42), follow these steps: diff --git a/tests/Containerfile.test-derive b/tests/Containerfile.test-derive index 07cb9bc..72864ff 100644 --- a/tests/Containerfile.test-derive +++ b/tests/Containerfile.test-derive @@ -1,13 +1,12 @@ -# This test case exercises using the fedora-bootc image as a builder -# to generate a minimal target image derived from CentOS Stream 10 content, -# and then further extends it in a secondary phase. -FROM quay.io/fedora/fedora-bootc:rawhide as repos +# This test case exercises using the fedora-bootc image as a builder to +# generate a minimal target image, and then further extends it in a secondary +# phase. # This is intentionally a locally built image FROM localhost/fedora-bootc as builder -RUN --mount=type=bind,from=repos,src=/,dst=/repos,rw < args.txt -/usr/libexec/bootc-base-imagectl --args-file args.txt build-rootfs --manifest=standard/manifest /repos /target-rootfs +/usr/libexec/bootc-base-imagectl --args-file args.txt build-rootfs --manifest=standard/manifest /target-rootfs EORUN # This pulls in the rootfs generated in the previous step diff --git a/tests/Containerfile.test-sysusers b/tests/Containerfile.test-sysusers index 53e255b..37165e0 100644 --- a/tests/Containerfile.test-sysusers +++ b/tests/Containerfile.test-sysusers @@ -1,15 +1,14 @@ # This test case exercises --sysusers. -FROM quay.io/fedora/fedora-bootc:rawhide as repos # This is intentionally a locally built image FROM localhost/fedora-bootc as builder -RUN --mount=type=bind,from=repos,src=/,dst=/repos,rw < overlay/usr/lib/sysusers.d/00-chrony.conf <