From 82b23f9738b788b64a14d72e697c0c9b569cb805 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 24 May 2024 11:38:52 -0700 Subject: [PATCH] Revert "D'oh, move the most important encryption test to BIOS" This reverts commit 508635ed1c1ebfcc0c91c29db34b5ee6882d662c and the fix-up follow-up, because this causes the test to have a different scenario which screws up gating. Argh. I guess we're stuck restarting it forever. Let's bump the retry number even higher instead. --- templates-updates.fif.json | 6 +++--- templates.fif.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates-updates.fif.json b/templates-updates.fif.json index 8d7ec608..d7b3005a 100644 --- a/templates-updates.fif.json +++ b/templates-updates.fif.json @@ -258,8 +258,8 @@ "machine": "bios", "product": "fedora-updates-workstation-live-iso-x86_64-*" }, - "fedora-updates-workstation-upgrade-x86_64-*-bios": { - "machine": "bios", + "fedora-updates-workstation-upgrade-x86_64-*-64bit": { + "machine": "64bit", "product": "fedora-updates-workstation-upgrade-x86_64-*" }, "fedora-updates-workstation-x86_64-*-64bit": { @@ -627,7 +627,7 @@ }, "upgrade_desktop_encrypted_64bit": { "profiles": { - "fedora-updates-workstation-upgrade-x86_64-*-bios": 5 + "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5 } }, "upgrade_realmd_client": { diff --git a/templates.fif.json b/templates.fif.json index dfcbfed7..7db5f216 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -3086,7 +3086,7 @@ "DESKTOP": "gnome", "ENCRYPT_PASSWORD": "weakpassword", "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2", - "RETRY": "2", + "RETRY": "4", "ROOT_PASSWORD": "weakpassword", "TEST_TARGET": "COMPOSE", "UPGRADE": "1",