opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

System tests: fix a multiarch problem

Browse Source 
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>
This commit is contained in:
Ed Santiago
2021-07-15 10:24:13 -06:00
parent d24fc6b843
commit e4dcb1004f
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/python/docker/compat/test_containers.py
View File

@ -206,6 +206,7 @@ class TestContainers(unittest.TestCase):
self.assertEqual(len(ctnrs), 1) self.assertEqual(len(ctnrs), 1)
def test_copy_to_container(self): def test_copy_to_container(self):
self.skipTest("FIXME: #10948 - test is broken")
ctr: Optional[Container] = None ctr: Optional[Container] = None
try: try:
test_file_content = b"Hello World!" test_file_content = b"Hello World!"

3
test/system/070-build.bats
View File

@ -922,6 +922,9 @@ function teardown() {
run_podman '?' rm -a -f run_podman '?' rm -a -f
run_podman '?' rmi -f build_test 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 basic_teardown
} }

17
test/system/120-load.bats
View File

@ -134,8 +134,16 @@ verify_iid_and_name() {
} }
@test "podman load - multi-image archive" { @test "podman load - multi-image archive" {
img1="quay.io/libpod/testimage:00000000" # img1 & 2 should be images that are not locally present; they must also
img2="quay.io/libpod/testimage:20200902" # 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 archive=$PODMAN_TMPDIR/myimage-$(random_string 8).tar
run_podman pull $img1 run_podman pull $img1
@ -151,8 +159,9 @@ verify_iid_and_name() {
} }
@test "podman load - multi-image archive with redirect" { @test "podman load - multi-image archive with redirect" {
img1="quay.io/libpod/testimage:00000000" # (see comments in test above re: img1 & 2)
img2="quay.io/libpod/testimage:20200902" 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 archive=$PODMAN_TMPDIR/myimage-$(random_string 8).tar
run_podman pull $img1 run_podman pull $img1