From f818c0c38e020c83bfaf558f66709282e1eff85b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 19 Sep 2025 11:12:35 -0700 Subject: [PATCH] give podman tests even longer temporarily still getting some failures at 1800, so let's bump to 3600 and also bump MAX_JOB_TIME to accommodate. Signed-off-by: Adam Williamson --- templates.fif.json | 2 ++ tests/podman.pm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates.fif.json b/templates.fif.json index 6aaddd76..202f9c88 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -2041,6 +2041,7 @@ "settings": { "BOOTFROM": "c", "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", + "MAX_JOB_TIME": "14400", "NICTYPE": "tap", "POSTINSTALL": "podman", "POST_STATIC": "172.16.2.114 podman001.test.openqa.fedoraproject.org", @@ -2057,6 +2058,7 @@ "settings": { "BOOTFROM": "c", "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", + "MAX_JOB_TIME": "14400", "NICTYPE": "tap", "PARALLEL_WITH": "podman", "POSTINSTALL": "_podman_client", diff --git a/tests/podman.pm b/tests/podman.pm index 1a5b1e81..696e6386 100644 --- a/tests/podman.pm +++ b/tests/podman.pm @@ -16,8 +16,8 @@ sub run_integration_tests { # skips: # "podman checkpoint --export, with volumes" # fails on kernel 6.16, see https://github.com/checkpoint-restore/criu/issues/2626 - assert_script_run "bats --filter-tags '!ci:parallel' --filter 'export, with volumes|TCP/IPv4 large transfer, tap' /usr/share/podman/test/system | tee /tmp/podman-bats.txt", 1800; - assert_script_run 'bats --filter-tags ci:parallel --filter "export, with volumes|TCP/IPv4 large transfer, tap" -j $(nproc) /usr/share/podman/test/system | tee --append /tmp/podman-bats.txt', 1800; + assert_script_run "bats --filter-tags '!ci:parallel' --filter 'export, with volumes|TCP/IPv4 large transfer, tap' /usr/share/podman/test/system | tee /tmp/podman-bats.txt", 3600; + assert_script_run 'bats --filter-tags ci:parallel --filter "export, with volumes|TCP/IPv4 large transfer, tap" -j $(nproc) /usr/share/podman/test/system | tee --append /tmp/podman-bats.txt', 3600; # restore default behaviour assert_script_run "set +o pipefail"; # ensure we ran at least 100 tests (this is a check that the