diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-11-07 17:40:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-07 17:40:41 +0100 |
| commit | ee19c5524a134787a9c8e909d25b6a9ca7923fdf (patch) | |
| tree | dc576e7db4aa0b48cd5e95a96d98e0ceb5bd66ae | |
| parent | e1d9982c7b463b173cc8c261f61a9447ace62898 (diff) | |
| parent | f9d19a14f96efc531595cea01601241dfff7473d (diff) | |
| download | vyos-1x-ee19c5524a134787a9c8e909d25b6a9ca7923fdf.tar.gz vyos-1x-ee19c5524a134787a9c8e909d25b6a9ca7923fdf.zip | |
Merge pull request #1642 from sarthurdev/container_test
containers: T2216: Image download moved to smoketest package, skip test if image not available
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/vyos-1x-smoketest.postinst | 6 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_container.py | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/debian/control b/debian/control index d7cd5b688..66ac3c6f7 100644 --- a/debian/control +++ b/debian/control @@ -196,6 +196,7 @@ Description: VyOS configuration scripts and data for VMware Package: vyos-1x-smoketest Architecture: all Depends: + skopeo, snmp, vyos-1x Description: VyOS build sanity checking toolkit diff --git a/debian/vyos-1x-smoketest.postinst b/debian/vyos-1x-smoketest.postinst new file mode 100755 index 000000000..b33376bc3 --- /dev/null +++ b/debian/vyos-1x-smoketest.postinst @@ -0,0 +1,6 @@ +#!/bin/sh -e + +BUSYBOX_TAG="docker.io/library/busybox:stable" +OUTPUT_PATH="docker-archive://usr/share/vyos/busybox-stable.tar" + +skopeo copy --additional-tag "$BUSYBOX_TAG" "docker://$BUSYBOX_TAG" "$OUTPUT_PATH" diff --git a/smoketest/scripts/cli/test_container.py b/smoketest/scripts/cli/test_container.py index b9d308ae1..902156ee6 100755 --- a/smoketest/scripts/cli/test_container.py +++ b/smoketest/scripts/cli/test_container.py @@ -47,7 +47,10 @@ class TestContainer(VyOSUnitTestSHIM.TestCase): super(TestContainer, cls).setUpClass() # Load image for smoketest provided in vyos-build - cmd(f'cat {busybox_image_path} | sudo podman load') + try: + cmd(f'cat {busybox_image_path} | sudo podman load') + except: + cls.skipTest(cls, reason='busybox image not available') @classmethod def tearDownClass(cls): |