Give some long-running package install operations a bit longer

These have timed out quite often recently.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

lib/utils.pm

@@ -669,7 +669,7 @@ sub _repo_setup_updates {
         # where the updated packages should have been installed
         # already and we want to fail if they weren't, or CANNED
         # tests, there's no point updating the toolbox
-        script_run "dnf -y update", 900 unless (get_var("UPGRADE") || get_var("INSTALL") || get_var("CANNED"));
+        script_run "dnf -y update", 1200 unless (get_var("UPGRADE") || get_var("INSTALL") || get_var("CANNED"));
         # however, on liveinst tests, we need to update the packages
         # we installed above, just in case they're in the update
         # under test; otherwise we get a bogus failure for the package
@@ -1158,8 +1158,7 @@ sub advisory_check_nonmatching_packages {
     upload_logs "/tmp/installedupdatepkgs.txt", failok => 1;
     upload_logs "/mnt/updatepkgs.txt", failok => 1;
     # download the check script and run it
-    # FIXME: change this to main when the PR is merged
-    assert_script_run 'curl -o updvercheck.py https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/better-check-nonmatching/f/updvercheck.py', timeout => 120;
+    assert_script_run 'curl -o updvercheck.py https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/main/f/updvercheck.py', timeout => 120;
     my $advisory = get_var("ADVISORY");
     my $cmd = 'python3 ./updvercheck.py /mnt/updatepkgs.txt /tmp/installedupdatepkgs.txt';
     $cmd .= " $advisory" if ($advisory);

needles/firefox/addon_success-20210607.json

@@ -1,22 +1,22 @@
 {
-  "area": [
-    {
-      "ypos": 521,
-      "type": "match",
-      "xpos": 521,
-      "height": 17,
-      "width": 62
-    },
-    {
-      "width": 20,
-      "height": 19,
-      "ypos": 84,
-      "xpos": 953,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "firefox_addon_success"
-  ]
+    "area": [
+        {
+            "height": 17,
+            "type": "match",
+            "width": 42,
+            "xpos": 521,
+            "ypos": 521
+        },
+        {
+            "height": 19,
+            "type": "match",
+            "width": 20,
+            "xpos": 953,
+            "ypos": 84
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "firefox_addon_success"
+    ]
 }

needles/firefox/addon_success-20220503.json

@@ -1,22 +1,22 @@
 {
-  "area": [
-    {
-      "xpos": 529,
-      "height": 17,
-      "width": 62,
-      "ypos": 521,
-      "type": "match"
-    },
-    {
-      "type": "match",
-      "height": 19,
-      "ypos": 84,
-      "width": 20,
-      "xpos": 953
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "firefox_addon_success"
-  ]
+    "area": [
+        {
+            "height": 17,
+            "type": "match",
+            "width": 42,
+            "xpos": 529,
+            "ypos": 521
+        },
+        {
+            "height": 19,
+            "type": "match",
+            "width": 20,
+            "xpos": 953,
+            "ypos": 84
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "firefox_addon_success"
+    ]
 }

needles/firefox/addon_success-20230117.json

@@ -1,22 +1,22 @@
 {
-  "area": [
-    {
-      "height": 17,
-      "width": 62,
-      "type": "match",
-      "ypos": 524,
-      "xpos": 529
-    },
-    {
-      "height": 19,
-      "xpos": 550,
-      "type": "match",
-      "width": 20,
-      "ypos": 128
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "firefox_addon_success"
-  ]
+    "area": [
+        {
+            "height": 17,
+            "type": "match",
+            "width": 42,
+            "xpos": 529,
+            "ypos": 524
+        },
+        {
+            "height": 19,
+            "type": "match",
+            "width": 20,
+            "xpos": 550,
+            "ypos": 128
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "firefox_addon_success"
+    ]
 }

tests/_live_build.pm

@@ -78,7 +78,7 @@ sub run {
     # upload the kickstart so we can check it
     upload_logs "openqa.ks";
     # now install the tools into the mock
-    assert_script_run "mock -r openqa --isolation=simple --install bash coreutils glibc-all-langpacks lorax-lmc-novirt selinux-policy-targeted shadow-utils util-linux", 600;
+    assert_script_run "mock -r openqa --isolation=simple --install bash coreutils glibc-all-langpacks lorax-lmc-novirt selinux-policy-targeted shadow-utils util-linux", 900;
     # now make the image build directory inside the mock root and put the kickstart there
     assert_script_run 'mock -r openqa --isolation=simple --chroot "mkdir -p /chroot_tmpdir"';
     assert_script_run "mock -r openqa --isolation=simple --copyin openqa.ks /chroot_tmpdir";