From dc7ff01f2744ae54a0195682b8355a4a9d4de45a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 14 Mar 2024 14:34:38 -0700 Subject: [PATCH] toolbox: handle OCI images (as produced by Kiwi) We changed to building toolbox container images with Kiwi. These are OCI archives, not docker archives. So we need to call skopeo appropriately. Signed-off-by: Adam Williamson --- tests/toolbox.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/toolbox.pm b/tests/toolbox.pm index 1221166a..1013f0fe 100644 --- a/tests/toolbox.pm +++ b/tests/toolbox.pm @@ -27,8 +27,8 @@ sub run { 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; + my $format = $image =~ "oci" ? "oci-archive" : "docker-archive"; + assert_script_run "skopeo copy $format:/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