From f7e7f0101fa6351cb9ab8b3299043e2f879dc897 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 25 Aug 2026 12:18:14 -0400 Subject: [PATCH] tests: don't use rawhide image for yum repos The repo locations moved in F45+ [1] and so now when testing F44 in CI we end up with a failure like: ``` [2/3] STEP 2/2: RUN --mount=type=bind,from=repos,src=/,dst=/repos,rw < args.txt...) rpm-ostree version: 2026.2 error: Installing packages: No enabled repositories error: Executing compose install: ExitStatus(unix_wait_status(256)) Error executing command: Command '['rpm-ostree', 'compose', 'rootfs', '--source-root-rw=/repos', '/tmp/tmpmnq4sg6s.json', '/target-rootfs']' returned non-zero exit status 1. subprocess exited with status 1 ``` Let's drop using the rawhide image just for `repos` and use the repos baked into the image we built instead (which should match the target Fedora version we're testing). [1] https://fedoraproject.org/wiki/Changes/RelocateRpmRepoConfigsToUsr --- tests/Containerfile.test-derive | 11 +++++------ tests/Containerfile.test-sysusers | 5 ++--- 2 files changed, 7 insertions(+), 9 deletions(-) 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 <