diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-16 04:26:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 04:26:18 -0400 |
| commit | f0cd16cb32676eaf5ee337b50e8628f2f49ccce9 (patch) | |
| tree | c3576a58549f6505fc548d0c2e377743d69fd93d | |
| parent | 0894a9e466d28d23fc6bdc1ef124e1129082183c (diff) | |
| parent | e4dcb1004fa6b6966977bc8f9b707040ae09a239 (diff) | |
| download | podman-f0cd16cb32676eaf5ee337b50e8628f2f49ccce9.tar.gz podman-f0cd16cb32676eaf5ee337b50e8628f2f49ccce9.tar.bz2 podman-f0cd16cb32676eaf5ee337b50e8628f2f49ccce9.zip | |
Merge pull request #10947 from edsantiago/multiarch_images
System tests: fix a multiarch problem
| -rw-r--r-- | test/python/docker/compat/test_containers.py | 1 | ||||
| -rw-r--r-- | test/system/070-build.bats | 3 | ||||
| -rw-r--r-- | test/system/120-load.bats | 17 |
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 |