Skip to content

[release-1.41] tests: remove dependencies on online apt repositories #6834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nalind wants to merge 1 commit into
base: release-1.41
Choose a base branch
from
Open

[release-1.41] tests: remove dependencies on online apt repositories #6834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/NEW-IMAGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@
#
# Format is one FQIN per line. Enumerate them below:
#
quay.io/hummingbird/git
registry.access.redhat.com/ubi10
2 changes: 1 addition & 1 deletion tests/chroot.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ load helpers
# chosen because its rootfs doesn't have any uid/gid ownership above
# $rangesize, because the nested namespace needs to be able to represent all
# of them
baseimage=registry.access.redhat.com/ubi9-micro:latest
baseimage=registry.access.redhat.com/ubi10:latest
_prefetch $baseimage
baseimagef=$(tr -c a-zA-Z0-9.- - <<< "$baseimage")
# create the directories that we need
Expand Down
7 changes: 4 additions & 3 deletions tests/conformance/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ bash
docker pull mirror.gcr.io/golang
docker pull mirror.gcr.io/alpine
docker pull mirror.gcr.io/busybox
docker pull quay.io/fedora/python-311:latest
docker pull quay.io/libpod/centos:7
docker pull registry.fedoraproject.org/fedora-minimal:42-aarch64
docker pull registry.fedoraproject.org/fedora-minimal:42-x86_64
docker pull registry.fedoraproject.org/fedora-minimal
docker pull quay.io/libpod/ubuntu:latest
docker pull quay.io/libpod/busybox@sha256:32968e717e29f79e5b889721908b3be6d1573992e1f3ba4c9a41718e2728458c
docker pull quay.io/libpod/busybox@sha256:1faaf7a75319417261267b3dcef6a2b14c8c5122d7fcc7abeb07a32bc19728fd
```

This test program is used as input in a few of the conformance tests:
Expand Down
20 changes: 10 additions & 10 deletions tests/conformance/testdata/header-builtin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# if TARGETARCH is defined, we'l pull the x86_64 image
FROM registry.fedoraproject.org/fedora-minimal:42${TARGETARCH:+-x86_64} AS amd64
# if TARGETARCH is defined, we'l pull the aarch64 image
FROM registry.fedoraproject.org/fedora-minimal:42${TARGETARCH:+-aarch64} AS arm64
# if TARGETARCH is defined, we'll pull the amd64 image from quay.io/libpod/busybox:glibc, otherwise we'll get the native one
FROM quay.io/libpod/busybox${TARGETARCH:+@sha256:32968e717e29f79e5b889721908b3be6d1573992e1f3ba4c9a41718e2728458c} AS amd64
# if TARGETARCH is defined, we'll pull the arm64 image from quay.io/libpod/busybox:glibc, otherwise we'll get the native one
FROM quay.io/libpod/busybox${TARGETARCH:+@sha256:1faaf7a75319417261267b3dcef6a2b14c8c5122d7fcc7abeb07a32bc19728fd} AS arm64

# run "file" against both shared libraries
FROM registry.fedoraproject.org/fedora-minimal AS native
# run "readelf" against both shared libraries from any image that comes with it
FROM quay.io/fedora/python-311:latest AS native
USER 0:0
COPY --from=amd64 /lib64/libc.so.6 /libc-amd64
COPY --from=arm64 /lib64/libc.so.6 /libc-arm64
RUN microdnf -y install file && microdnf -y clean all
RUN file /libc-* | tee /libc-types.txt && touch -d @0 /libc-types.txt
RUN readelf -h /libc-* | grep -i machine: | sort -u | tee /libc-types.txt && touch -d @0 /libc-types.txt

# expect them to have different target architectures listed in their ELF headers
FROM registry.fedoraproject.org/fedora-minimal
# expect to have read two different "Machine:" values from library headers
FROM scratch
COPY --from=native /libc-types.txt /
8 changes: 2 additions & 6 deletions tests/copy.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,8 @@ parents/y/b.txt"

@test "copy-preserving-extended-attributes" {
createrandom ${TEST_SCRATCH_DIR}/randomfile
# if we need to change which image we use, any image that can provide a working setattr/setcap/getfattr will do
image="quay.io/libpod/ubuntu"
# if we need to change which image we use, any image that includes working setattr/setcap/getfattr will do
image=registry.access.redhat.com/ubi10
if ! which setfattr > /dev/null 2> /dev/null; then
skip "setfattr not available, unable to check if it'll work in filesystem at ${TEST_SCRATCH_DIR}"
fi
Expand All @@ -549,8 +549,6 @@ parents/y/b.txt"
_prefetch $image
run_buildah from --quiet $WITH_POLICY_JSON $image
first="$output"
run_buildah run $first apt-get -y update
run_buildah run $first apt-get -y install attr libcap2-bin
run_buildah copy $first ${TEST_SCRATCH_DIR}/randomfile /
# set security.capability
run_buildah run $first setcap cap_setuid=ep /randomfile
Expand All @@ -559,8 +557,6 @@ parents/y/b.txt"
# copy the file to a second container
run_buildah from --quiet $WITH_POLICY_JSON $image
second="$output"
run_buildah run $second apt-get -y update
run_buildah run $second apt-get -y install attr
run_buildah copy --from $first $second /randomfile /
# compare what the extended attributes look like. if we're on a system with SELinux, there's a label in here, too
run_buildah run $first sh -c "getfattr -d -m . --absolute-names /randomfile | grep -v ^security.selinux | sort"
Expand Down
Loading