srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2025-02-19 05:44:31 +00:00
Code Issues Releases Activity

podman: twiddle flow a bit, give dnf command a little longer

Browse Source 
We don't really need two separate CANNED conditionals and two
dnf commands, let's flip it around like this, and give the
remaining command 300 seconds not 240.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2025-02-10 14:05:06 -08:00
parent 69b4ecb789
commit ec79aa0bc4
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/podman.pm
View File

@ -9,13 +9,18 @@ use utils;
sub run { 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 podman # on non-canned flavors, we need to install podman, may as well
assert_script_run "dnf -y install podman", 240 unless (get_var("CANNED")); # also install the tests now
# check podman is installed # check podman is installed
assert_script_run "rpm -q podman";
my $relnum = get_release_number; my $relnum = get_release_number;
unless (get_var("CANNED")) { if (get_var("CANNED")) {
# run the upstream integration tests # check podman is pre-installed
assert_script_run "rpm -q podman";
}
else {
# install podman and run the upstream integration tests
assert_script_run "dnf -y install podman podman-tests bats", 300; assert_script_run "dnf -y install podman podman-tests bats", 300;
# needed so we exit 1 when the bats command fails # needed so we exit 1 when the bats command fails
assert_script_run "set -o pipefail"; assert_script_run "set -o pipefail";