From 81ca81d44d842ed5d22725774665324663e3aca7 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Fri, 4 Nov 2022 10:52:43 +0100
Subject: containers: T2216: Skip test if image not available

---
 smoketest/scripts/cli/test_container.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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):
-- 
cgit v1.2.3


From f9d19a14f96efc531595cea01601241dfff7473d Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Mon, 7 Nov 2022 15:42:04 +0100
Subject: containers: T2216: Move skopeo and busybox image to smoketest
 post-install

---
 debian/control                    | 1 +
 debian/vyos-1x-smoketest.postinst | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100755 debian/vyos-1x-smoketest.postinst

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"
-- 
cgit v1.2.3