From 777e378a0db695ee5d5ad3565e74c83e26003ca3 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 22 Feb 2024 16:00:03 -0800
Subject: [PATCH] toolbox: test image from the compose where possible

per https://pagure.io/fedora-qa/issue/766 , this is a hole in our
current test approach: we are testing whatever the current
'stable' toolbox image is for the release, not the image that
is produced as part of the compose. This enhances the test to
test both, when possible. If the var TOOLBOX_IMAGE is set, we
will first check that a 'normal' `toolbox create` works - i.e.
that all the toolbox logic works right and it can actually find
a default image to download - but then we throw that toolbox
away, download the image (the value of the var is expected to
be a URL for the image file), register it with skopeo, and then
recreate the container using that image. Then we proceed with
the rest of the test as usual.

If TOOLBOX_IMAGE is not set, the test should proceed as before,
using the 'default' downloaded image.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 tests/toolbox.pm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/tests/toolbox.pm b/tests/toolbox.pm
index cb384fb9..46b37cca 100644
--- a/tests/toolbox.pm
+++ b/tests/toolbox.pm
@@ -1,6 +1,7 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 
 sub run {
@@ -10,8 +11,30 @@ sub run {
     assert_script_run "dnf -y install toolbox", 360 unless (get_var("CANNED"));
     # check toolbox is installed
     assert_script_run "rpm -q toolbox";
-    # check to see if you can create a new toolbox container
+    # check to see if you can create a new toolbox container (this
+    # will download the 'current' image for the same release and use
+    # that; we want to check that works even if we will go on to test
+    # an image from the compose below)
     assert_script_run "toolbox create container1 -y", 300;
+    my $image = get_var("TOOLBOX_IMAGE");
+    if ($image) {
+        # we have a toolbox image to test in the item under test
+        # (probably a compose), so let's recreate container1 using
+        # that instead
+        my $relnum = get_release_number;
+        assert_script_run 'toolbox rm container1';
+        assert_script_run "toolbox rmi containers-storage:registry.fedoraproject.org/fedora-toolbox:$relnum";
+        assert_script_run "curl -o /var/tmp/toolbox.tar.gz $image", 300;
+        # this registers the downloaded image such that `toolbox create`
+        # will use it, rather than downloading one. it takes a while
+        
+        assert_script_run "skopeo copy docker-archive:/var/tmp/toolbox.tar.gz containers-storage:registry.fedoraproject.org/fedora-toolbox:$relnum", 600;
+        # we do not pass -y this time as we do not want to allow a
+        # download, if toolbox wants to do one, something has gone
+        # wrong. unfortunately there is no -n so we just have to let
+        # it time out in that case
+        assert_script_run "toolbox create container1", 60;
+    }
     # check to see if toolbox can list container
     assert_script_run "toolbox list | grep container1";
     # run a specific command on a given container