summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2021-07-15 10:24:13 -0600
committerEd Santiago <santiago@redhat.com>2021-07-15 11:29:58 -0600
commite4dcb1004fa6b6966977bc8f9b707040ae09a239 (patch)
tree58d9776a89a2e004803cd57878d7b1909790642e
parentd24fc6b84384cbe4188db941ad452f02d3713540 (diff)
downloadpodman-e4dcb1004fa6b6966977bc8f9b707040ae09a239.tar.gz
podman-e4dcb1004fa6b6966977bc8f9b707040ae09a239.tar.bz2
podman-e4dcb1004fa6b6966977bc8f9b707040ae09a239.zip
System tests: fix a multiarch problem
The multi-image load test was failing on non-x86_64 arch, because the images used by the test (:00000000, :20200902) did not have manifests for the given arch. Solution: all we need are two nonlocal images. Use the predefined NONLOCAL_IMAGE for one, and a new :multiimage tag (manually created, currently == :20210610) for the other. Document, so if/when RHEL adds new supported arches, the test will fail but a maintainer will have a clue what to do. Also, as long as I'm in here: add 'image prune -f' to teardown in build.bats, to avoid seeing lots of red "stray image" warnings in test logs. Also: skip a broken/flaky python test Signed-off-by: Ed Santiago <santiago@redhat.com>
-rw-r--r--test/python/docker/compat/test_containers.py1
-rw-r--r--test/system/070-build.bats3
-rw-r--r--test/system/120-load.bats17
3 files changed, 17 insertions, 4 deletions
diff --git a/test/python/docker/compat/test_containers.py b/test/python/docker/compat/test_containers.py
index 38ac5b59f..9fcdf49ea 100644
--- a/test/python/docker/compat/test_containers.py
+++ b/test/python/docker/compat/test_containers.py
@@ -206,6 +206,7 @@ class TestContainers(unittest.TestCase):
self.assertEqual(len(ctnrs), 1)
def test_copy_to_container(self):
+ self.skipTest("FIXME: #10948 - test is broken")
ctr: Optional[Container] = None
try:
test_file_content = b"Hello World!"
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 06ff0c9e2..7b76c585f 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -922,6 +922,9 @@ function teardown() {
run_podman '?' rm -a -f
run_podman '?' rmi -f build_test
+ # Many of the tests above leave interim layers behind. Clean them up.
+ run_podman '?' image prune -f
+
basic_teardown
}
diff --git a/test/system/120-load.bats b/test/system/120-load.bats
index 67687a5b0..97ea0f528 100644
--- a/test/system/120-load.bats
+++ b/test/system/120-load.bats
@@ -134,8 +134,16 @@ verify_iid_and_name() {
}
@test "podman load - multi-image archive" {
- img1="quay.io/libpod/testimage:00000000"
- img2="quay.io/libpod/testimage:20200902"
+ # img1 & 2 should be images that are not locally present; they must also
+ # be usable on the host arch. The nonlocal image (:000000xx) is kept
+ # up-to-date for all RHEL/Fedora arches; the other image we use is
+ # the one tagged ':multiimage', which as of 2021-07-15 is :20210610
+ # but that tag will grow stale over time. If/when this test fails,
+ # your first approach should be to manually update :multiimage to
+ # point to a more recent testimage. (Use the quay.io GUI, it's waaay
+ # easier than pulling/pushing the correct manifest.)
+ img1=${PODMAN_NONLOCAL_IMAGE_FQN}
+ img2="$PODMAN_TEST_IMAGE_REGISTRY/$PODMAN_TEST_IMAGE_USER/$PODMAN_TEST_IMAGE_NAME:multiimage"
archive=$PODMAN_TMPDIR/myimage-$(random_string 8).tar
run_podman pull $img1
@@ -151,8 +159,9 @@ verify_iid_and_name() {
}
@test "podman load - multi-image archive with redirect" {
- img1="quay.io/libpod/testimage:00000000"
- img2="quay.io/libpod/testimage:20200902"
+ # (see comments in test above re: img1 & 2)
+ img1=${PODMAN_NONLOCAL_IMAGE_FQN}
+ img2="$PODMAN_TEST_IMAGE_REGISTRY/$PODMAN_TEST_IMAGE_USER/$PODMAN_TEST_IMAGE_NAME:multiimage"
archive=$PODMAN_TMPDIR/myimage-$(random_string 8).tar
run_podman pull $img1