srbala
/
os-autoinst-distri-fedora
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
1
0
Fork 0
Code Issues Releases Activity

Revert "Install composefs with podman/toolbox to workaround #2275820" 

This reverts commit 7b29a8f1b2.
It should no longer be needed now containers-common added a
dependency.
This commit is contained in:
Adam Williamson 2024-04-19 16:29:58 -07:00
parent 5a548fd3c7
commit f9cda76860
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/podman.pm
View File

@ -16,10 +16,7 @@ sub run {
my $relnum = get_release_number; my $relnum = get_release_number;
unless (get_var("CANNED")) { unless (get_var("CANNED")) {
# run the upstream integration tests # run the upstream integration tests
# FIXME composefs seems to be a hard dep since containers-common-0.58.0-10.fc41 assert_script_run "dnf -y install podman podman-tests bats", 300;
# 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; 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 # check to see if you can pull an image from the registry

5
tests/toolbox.pm
View File

@ -8,10 +8,7 @@ sub run {
my $self = shift; my $self = shift;
$self->root_console(tty => 3); $self->root_console(tty => 3);
# on non-canned flavors, we need to install toolbox # on non-canned flavors, we need to install toolbox
# FIXME composefs seems to be a hard dep since containers-common-0.58.0-10.fc41 assert_script_run "dnf -y install toolbox", 360 unless (get_var("CANNED"));
# 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 # check toolbox is installed
assert_script_run "rpm -q toolbox"; assert_script_run "rpm -q toolbox";
# check to see if you can create a new toolbox container (this # check to see if you can create a new toolbox container (this