Merge pull request #27884 from ypu/backport-build-test-fix

[v5.6-rhel] test/system: remove apk from build
This commit is contained in:
Paul Holzinger 2026-01-09 14:27:14 +01:00 committed by GitHub
commit b194cd996e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -16,13 +16,11 @@ load helpers
dockerfile=$tmpdir/Dockerfile
cat >$dockerfile <<EOF
FROM $IMAGE
RUN apk add nginx
RUN echo $rand_content > /$rand_filename
EOF
# The 'apk' command can take a long time to fetch files; bump timeout
imgname="b-$(safename)"
PODMAN_TIMEOUT=240 run_podman build -t $imgname --format=docker $tmpdir
run_podman build -t $imgname --format=docker $tmpdir
is "$output" ".*COMMIT" "COMMIT seen in log"
# $IMAGE is preloaded, so we should never re-pull