From e5fba0fea5b938811a67dc0de539be0fc7ce562a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 7 Jan 2025 09:47:48 -0800
Subject: [PATCH] Retry live install tests 5 times

Unfortunately it doesn't look like qemu `-cpu host` really does
fully work around the grub2-mkconfig install hang issue, so we
need retries still :( As well as doing it for the update tests,
let's do it for the compose install tests. We use a substitution
to only increase the retry count for live images. We don't need
to set INSTALL_RETRY for other products - if it's not set then
RETRY winds up empty, and openQA treats that the same as it being
unset, which is fine.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 templates-updates.fif.json |  3 ++-
 templates.fif.json         | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index 143b88e5..cdc24b58 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -380,7 +380,8 @@
                 "+START_AFTER_TEST": "%LIVE_BUILD_TEST%@%ARCH_BASE_MACHINE%",
                 "INSTALL": "1",
                 "ISO": "Fedora-%SUBVARIANT%-Live-%ARCH%-%ADVISORY_OR_TASK%.iso",
-                "QEMURAM": "4096"
+                "QEMURAM": "4096",
+                "RETRY": "5"
             }
         },
         "install_default_update_netinst": {
diff --git a/templates.fif.json b/templates.fif.json
index efffe42b..79725c78 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -207,6 +207,7 @@
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "DESKTOP": "kde",
                 "HDDSIZEGB": "15",
+                "INSTALL_RETRY": "5",
                 "LIVE": "1",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO"
@@ -220,6 +221,7 @@
             "settings": {
                 "DESKTOP": "i3",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
+                "INSTALL_RETRY": "5",
                 "LIVE": "1",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO",
@@ -356,6 +358,7 @@
                 "DESKTOP": "gnome",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "HDDSIZEGB": "20",
+                "INSTALL_RETRY": "5",
                 "LIVE": "1",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO"
@@ -370,6 +373,7 @@
                 "DESKTOP": "gnome",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "HDDSIZEGB": "20",
+                "INSTALL_RETRY": "5",
                 "LIVE": "1",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO"
@@ -1729,7 +1733,8 @@
             },
             "settings": {
                 "PACKAGE_SET": "default",
-                "POSTINSTALL": "_collect_data"
+                "POSTINSTALL": "_collect_data",
+                "RETRY": "%INSTALL_RETRY%"
             }
         },
         "install_default_upload": {
@@ -1752,6 +1757,7 @@
             "settings": {
                 "PACKAGE_SET": "default",
                 "POSTINSTALL": "_collect_data",
+                "RETRY": "%INSTALL_RETRY%",
                 "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2"
             }
         },
@@ -1982,7 +1988,8 @@
                 "fedora-KDE-live-iso-x86_64-*-64bit": 21
             },
             "settings": {
-                "INSTALL_NO_USER": "1"
+                "INSTALL_NO_USER": "1",
+                "RETRY": "%INSTALL_RETRY%"
             }
         },
         "install_package_set_kde": {