mirror of
https://gitlab.com/fedora/bootc/base-images.git
synced 2026-08-30 21:10:44 +00:00
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 <<EORUN (echo -e '--install\nltrace' > 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
This commit is contained in:
parent
6d9956d3f7
commit
f7e7f0101f
2 changed files with 7 additions and 9 deletions
|
|
@ -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 <<EORUN
|
||||
RUN <<EORUN
|
||||
echo -e '--install\nltrace' > 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
|
||||
|
|
|
|||
|
|
@ -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 <<EORUN
|
||||
RUN <<EORUN
|
||||
mkdir -p overlay/usr/lib/sysusers.d
|
||||
cat > overlay/usr/lib/sysusers.d/00-chrony.conf <<EOF
|
||||
g chrony 888
|
||||
u chrony 888:888 - - -
|
||||
EOF
|
||||
/usr/libexec/bootc-base-imagectl build-rootfs --manifest=standard/manifest /repos /target-rootfs --sysusers --add-dir overlay
|
||||
/usr/libexec/bootc-base-imagectl build-rootfs --manifest=standard/manifest /target-rootfs --sysusers --add-dir overlay
|
||||
EORUN
|
||||
|
||||
# This pulls in the rootfs generated in the previous step
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue