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 <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-04-17 16:58:39 -07:00
parent d3a6beda3d
commit 7b29a8f1b2
2 changed files with 8 additions and 2 deletions

View File

@ -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

View File

@ -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