Merge pull request containers#10200 from edsantiago/bats

system test image: add arm64v8 image
Luap99 · May 4, 2021 · 5204842 · 5204842
2 parents 9788289 + 0c634ff
commit 5204842
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/test/system/build-testimage b/test/system/build-testimage
@@ -78,7 +78,7 @@ podman rmi -f testimage &> /dev/null || true
 # and because Dan says arch emulation is not currently working on podman
 # (no further details).
 # Arch emulation on Fedora requires the qemu-user-static package.
-for arch in amd64 ppc64le s390x;do
+for arch in amd64 arm64v8 ppc64le s390x;do
     ${BUILDAH} bud \
                --arch=$arch \
                --build-arg ARCH=$arch \
@@ -106,9 +106,9 @@ ${BUILDAH} manifest push --all  ${remote_tag} docker://${remote_tag}
 # As of 2021-02-24 it is simply busybox, because it is super small,
 # but it's complicated because of multiarch:
 #
-#    img=quay.io/libpod/testimage:00000001
+#    img=quay.io/libpod/testimage:0000000<current+1>
 #    buildah manifest create $img
-#    for arch in amd64 ppc64le s390x;do
+#    for arch in amd64 arm64v8 ppc64le s390x;do
 #        buildah pull --arch $arch docker.io/$arch/busybox:1.32.0
 #        buildah manifest add $img docker.io/$arch/busybox:1.32.0
 #    done

diff --git a/test/system/helpers.bash b/test/system/helpers.bash
@@ -7,14 +7,14 @@ PODMAN=${PODMAN:-podman}
 PODMAN_TEST_IMAGE_REGISTRY=${PODMAN_TEST_IMAGE_REGISTRY:-"quay.io"}
 PODMAN_TEST_IMAGE_USER=${PODMAN_TEST_IMAGE_USER:-"libpod"}
 PODMAN_TEST_IMAGE_NAME=${PODMAN_TEST_IMAGE_NAME:-"testimage"}
-PODMAN_TEST_IMAGE_TAG=${PODMAN_TEST_IMAGE_TAG:-"20210223"}
+PODMAN_TEST_IMAGE_TAG=${PODMAN_TEST_IMAGE_TAG:-"20210427"}
 PODMAN_TEST_IMAGE_FQN="$PODMAN_TEST_IMAGE_REGISTRY/$PODMAN_TEST_IMAGE_USER/$PODMAN_TEST_IMAGE_NAME:$PODMAN_TEST_IMAGE_TAG"
 PODMAN_TEST_IMAGE_ID=
 
 # Remote image that we *DO NOT* fetch or keep by default; used for testing pull
 # This changed from 0 to 1 on 2021-02-24 due to multiarch considerations; it
 # should change only very rarely.
-PODMAN_NONLOCAL_IMAGE_FQN="$PODMAN_TEST_IMAGE_REGISTRY/$PODMAN_TEST_IMAGE_USER/$PODMAN_TEST_IMAGE_NAME:00000001"
+PODMAN_NONLOCAL_IMAGE_FQN="$PODMAN_TEST_IMAGE_REGISTRY/$PODMAN_TEST_IMAGE_USER/$PODMAN_TEST_IMAGE_NAME:00000002"
 
 # Because who wants to spell that out each time?
 IMAGE=$PODMAN_TEST_IMAGE_FQN