From e4dcb1004fa6b6966977bc8f9b707040ae09a239 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 15 Jul 2021 10:24:13 -0600 Subject: 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 --- test/python/docker/compat/test_containers.py | 1 + 1 file changed, 1 insertion(+) (limited to 'test/python/docker/compat') 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!" -- cgit v1.2.3-54-g00ecf