From 7b29a8f1b2cce95bd3147e83a2e2397d5597eb29 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 17 Apr 2024 16:58:39 -0700 Subject: [PATCH] Install composefs with podman/toolbox to workaround #2275820 containers-common seems to have inadvertently introduced a hard dependency on composefs, but not expressed it as a package dep. While I'm trying to get that fixed, let's ensure the podman and toolbox tests don't fail on it. Signed-off-by: Adam Williamson --- tests/podman.pm | 5 ++++- tests/toolbox.pm | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/podman.pm b/tests/podman.pm index 10b0dc35..0f28b783 100644 --- a/tests/podman.pm +++ b/tests/podman.pm @@ -16,7 +16,10 @@ sub run { my $relnum = get_release_number; unless (get_var("CANNED")) { # run the upstream integration tests - assert_script_run "dnf -y install podman podman-tests bats", 300; + # FIXME composefs seems to be a hard dep since containers-common-0.58.0-10.fc41 + # https://bugzilla.redhat.com/show_bug.cgi?id=2275820 + # drop it if that gets fixed + assert_script_run "dnf -y install podman podman-tests bats composefs", 300; assert_script_run "bats --filter-tags distro-integration /usr/share/podman/test/system", 600; } # check to see if you can pull an image from the registry diff --git a/tests/toolbox.pm b/tests/toolbox.pm index 1013f0fe..9ae576c6 100644 --- a/tests/toolbox.pm +++ b/tests/toolbox.pm @@ -8,7 +8,10 @@ sub run { my $self = shift; $self->root_console(tty => 3); # on non-canned flavors, we need to install toolbox - assert_script_run "dnf -y install toolbox", 360 unless (get_var("CANNED")); + # FIXME composefs seems to be a hard dep since containers-common-0.58.0-10.fc41 + # https://bugzilla.redhat.com/show_bug.cgi?id=2275820 + # drop it if that gets fixed + assert_script_run "dnf -y install toolbox composefs", 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 (this