From 271f1f33dfcb5152f14ea5d0eb2d5158c44f3323 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 24 Oct 2025 14:20:02 -0700 Subject: [PATCH] Set INSTALL_RETRY for all flavors, use on more tests, drop to 1 INSTALL_RETRY was introduced to try and retry live installs five times to mitigate the effects of https://bugzilla.redhat.com/show_bug.cgi?id=2329581 . That bug is fixed, but we *do* still have some flakiness in live install tests; we still occasionally hit the thing where install just stalls for no obvious reason, we sometimes hit https://bugzilla.redhat.com/show_bug.cgi?id=2402533 , and (especially on KDE due to https://bugzilla.redhat.com/show_bug.cgi?id=2404262 ) we sometimes get failures caused by mistyping in language select or user creation. So let's keep INSTALL_RETRY around, and use it on more tests - these are all webUI install tests that run on the live images - but drop it to 1, 5 is probably overkill for the current known issues. Also, let's define it for all flavors. In the initial commit I wrote that if it was not defined, RETRY would be set empty, but that's not true. What actually happens is RETRY gets set to the literal string %INSTALL_RETRY%, which is goofy. openQA still seems to interpret it as "don't retry", which is good, but let's avoid it. Also move the workstation_live_iso definition into the flavors with all the others, I don't know/remember why only that one was in products. Signed-off-by: Adam Williamson --- templates.fif.json | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/templates.fif.json b/templates.fif.json index 7b49e5b7..bf00bd03 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -91,12 +91,14 @@ "BaseOS-boot-iso": { "settings": { "DEPLOY_UPLOAD_TEST": "install_default_upload", + "INSTALL_RETRY": "", "TEST_TARGET": "ISO" } }, "BaseOS-dvd-iso": { "settings": { "DEPLOY_UPLOAD_TEST": "install_default_upload", + "INSTALL_RETRY": "", "TEST_TARGET": "ISO" } }, @@ -114,12 +116,14 @@ "settings": { "CANNED": "1", "DEPLOY_UPLOAD_TEST": "install_default_upload", + "INSTALL_RETRY": "", "TEST_TARGET": "ISO", "USER_LOGIN": "false" } }, "Everything-boot-iso": { "settings": { + "INSTALL_RETRY": "", "TEST_TARGET": "ISO" } }, @@ -127,6 +131,7 @@ "settings": { "CANNED": "1", "DEPLOY_UPLOAD_TEST": "install_default_upload", + "INSTALL_RETRY": "", "PACKAGE_SET": "default", "TEST_TARGET": "ISO" } @@ -136,7 +141,7 @@ "DEPLOY_UPLOAD_TEST": "install_default_upload", "DESKTOP": "kde", "HDDSIZEGB": "15", - "INSTALL_RETRY": "5", + "INSTALL_RETRY": "1", "LIVE": "1", "PACKAGE_SET": "default", "TEST_TARGET": "ISO" @@ -153,7 +158,7 @@ "settings": { "DESKTOP": "i3", "DEPLOY_UPLOAD_TEST": "install_default_upload", - "INSTALL_RETRY": "5", + "INSTALL_RETRY": "1", "LIVE": "1", "PACKAGE_SET": "default", "TEST_TARGET": "ISO", @@ -168,12 +173,14 @@ }, "Server-boot-iso": { "settings": { + "INSTALL_RETRY": "", "TEST_TARGET": "ISO" } }, "Server-dvd-iso": { "settings": { "DEPLOY_UPLOAD_TEST": "install_default_upload", + "INSTALL_RETRY": "", "TEST_TARGET": "ISO" } }, @@ -189,6 +196,7 @@ "DEPLOY_UPLOAD_TEST": "install_default_upload", "DESKTOP": "gnome", "HDDSIZEGB": "20", + "INSTALL_RETRY": "", "PACKAGE_SET": "default", "RETRY": "2", "TEST_TARGET": "ISO" @@ -199,6 +207,7 @@ "DESKTOP": "gnome", "DEPLOY_UPLOAD_TEST": "install_default_upload", "HDDSIZEGB": "20", + "INSTALL_RETRY": "1", "LIVE": "1", "PACKAGE_SET": "default", "TEST_TARGET": "ISO" @@ -353,10 +362,7 @@ }, "fedora-Workstation-live-iso-x86_64-*": { "arch": "x86_64", - "flavor": "Workstation-live-iso", - "settings": { - "INSTALL_RETRY": "5" - } + "flavor": "Workstation-live-iso" }, "fedora-Workstation-upgrade-x86_64-*": { "arch": "x86_64", @@ -1289,6 +1295,7 @@ "LANGUAGE": "japanese", "POSTINSTALL": "_console_login", "QEMU_DISABLE_SNAPSHOTS": "1", + "RETRY": "%INSTALL_RETRY%", "ROOT_PASSWORD": "weakpassword", "USER_LOGIN": "qwerty" } @@ -1446,6 +1453,7 @@ "LANGUAGE": "russian", "POSTINSTALL": "_console_login", "QEMU_DISABLE_SNAPSHOTS": "1", + "RETRY": "%INSTALL_RETRY%", "ROOT_PASSWORD": "weakpassword", "USER_LOGIN": "qwerty" } @@ -1546,6 +1554,7 @@ "LAYOUT": "french", "POSTINSTALL": "_console_login", "QEMU_DISABLE_SNAPSHOTS": "1", + "RETRY": "%INSTALL_RETRY%", "USER_LOGIN": "qwerty" } }, @@ -1979,6 +1988,7 @@ "settings": { "PARTITIONING": "webui_ext4", "POSTINSTALL": "disk_custom_blivet_standard_partition_ext4_postinstall", + "RETRY": "%INSTALL_RETRY%", "ROOT_PASSWORD": "weakpassword" } }, @@ -1990,6 +2000,7 @@ "settings": { "PARTITIONING": "webui_xfs", "POSTINSTALL": "disk_custom_xfs_postinstall", + "RETRY": "%INSTALL_RETRY%", "ROOT_PASSWORD": "weakpassword" } },