From 09e4f526a835b36312c346b9ba71b455862a1144 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 30 Jan 2024 09:47:44 -0800 Subject: [PATCH] Revert "Give ostree_build another half hour" This reverts commit 56c9e80f600801e21be7836bd946cebf677e7056. Things seem to have settled down with the mass rebuild and this test seems to be back to consistently taking about 90 minutes. --- templates-updates.fif.json | 2 +- tests/_ostree_build.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates-updates.fif.json b/templates-updates.fif.json index 6169ade7..47f95a64 100644 --- a/templates-updates.fif.json +++ b/templates-updates.fif.json @@ -446,7 +446,7 @@ "BOOTFROM": "c", "HDD_1": "disk_f%VERSION%_minimal_3_%ARCH%.qcow2", "HDDSIZEGB_3": "25", - "MAX_JOB_TIME": "12600", + "MAX_JOB_TIME": "10800", "+NUMDISKS": "3", "POSTINSTALL": "_ostree_build", "ROOT_PASSWORD": "weakpassword", diff --git a/tests/_ostree_build.pm b/tests/_ostree_build.pm index 022a79aa..8d7ba532 100644 --- a/tests/_ostree_build.pm +++ b/tests/_ostree_build.pm @@ -104,7 +104,7 @@ sub run { $cmd .= " --repo=/etc/yum.repos.d/advisory.repo" unless ($tag); $cmd .= " --repo=/etc/yum.repos.d/openqa-testtag.repo" if ($tag); $cmd .= " ./results"; - assert_script_run $cmd, 9000; + assert_script_run $cmd, 7000; # good to have the log around for checks upload_logs "lorax.log", failok => 1; assert_script_run "mv results/images/boot.iso ./${advortask}-${subv}-ostree-${arch}.iso";