test: Fix i386 tests with latest podman

This now requires specifying `--arch i386` explicitly.
martinpitt · Dec 19, 2024 · a4485a1 · a4485a1
1 parent faa96fd
commit a4485a1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/tests/run-alpine b/tests/run-alpine
@@ -10,7 +10,10 @@ else
     RUNC="sudo docker"
 fi
 
-$RUNC run --interactive ${OPTS:-} --volume `pwd`:/source:ro ${1:-docker.io/alpine} /bin/sh <<EOF
+IMAGE="${1:-docker.io/alpine}"
+[ "${IMAGE%i386*}" = "$IMAGE" ] || OPTS="${OPTS:-} --arch i386"
+
+$RUNC run --interactive ${OPTS:-} --volume `pwd`:/source:ro "$IMAGE" /bin/sh <<EOF
 # avoid meson exit code 125; https://github.com/containers/podman/issues/11540
 trap '[ \$? -eq 0 ] || exit 1' EXIT
 

diff --git a/tests/run-apt b/tests/run-apt
@@ -10,9 +10,12 @@ else
     RUNC="sudo docker"
 fi
 
+IMAGE="${1:-docker.io/amd64/ubuntu:rolling}"
+[ "${IMAGE%i386*}" = "$IMAGE" ] || OPTS="${OPTS:-} --arch i386"
+
 [ -n "${PUBLISH_TAR:-}" ] || MOUNT_MODE=":ro"
 
-$RUNC run --interactive ${RUNC_OPTIONS:-} ${OPTS:-} --volume `pwd`:/source${MOUNT_MODE:-} ${1:-docker.io/amd64/ubuntu:rolling} /bin/sh << EOF
+$RUNC run --interactive ${RUNC_OPTIONS:-} ${OPTS:-} --volume `pwd`:/source${MOUNT_MODE:-} "$IMAGE" /bin/sh << EOF
 set -ex
 
 # avoid meson exit code 125; https://github.com/containers/podman/issues/11540