Move most Silverblue testing to UEFI, add secure boot fallback

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

templates.fif.json

@@ -476,6 +476,10 @@
             "machine": "64bit",
             "product": "fedora-CoreOS-colive-iso-x86_64-*"
         },
+        "fedora-CoreOS-colive-iso-x86_64-*-uefi": {
+            "machine": "uefi",
+            "product": "fedora-CoreOS-colive-iso-x86_64-*"
+        },
         "fedora-Everything-boot-iso-ppc64le-*-ppc64le": {
             "machine": "ppc64le",
             "product": "fedora-Everything-boot-iso-ppc64le-*"
@@ -620,7 +624,7 @@
     "TestSuites": {
         "apps_startstop": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 40,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 40,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 40,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 40,
@@ -640,17 +644,17 @@
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
-                "fedora-KDE-live-iso-x86_64-*-64bit": 22,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 22,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 22,
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Server-dvd-iso-x86_64-*-64bit": 20,
                 "fedora-Server-raw_xz-raw.xz-aarch64-*-aarch64": 22,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -673,17 +677,17 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
-                "fedora-KDE-live-iso-x86_64-*-64bit": 22,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 22,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 22,
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Server-dvd-iso-x86_64-*-64bit": 20,
                 "fedora-Server-raw_xz-raw.xz-aarch64-*-aarch64": 22,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -706,7 +710,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
-                "fedora-KDE-live-iso-x86_64-*-64bit": 22,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 22,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 22,
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
@@ -734,7 +738,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
-                "fedora-KDE-live-iso-x86_64-*-64bit": 42,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 42,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 42,
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
@@ -763,17 +767,17 @@
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
-                "fedora-KDE-live-iso-x86_64-*-64bit": 42,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 42,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 42,
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
                 "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
                 "fedora-Server-raw_xz-raw.xz-aarch64-*-aarch64": 42,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 40,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 40,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -796,17 +800,17 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
-                "fedora-KDE-live-iso-x86_64-*-64bit": 42,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 42,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 42,
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
                 "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
                 "fedora-Server-raw_xz-raw.xz-aarch64-*-aarch64": 42,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 40,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 40,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -829,17 +833,17 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
-                "fedora-KDE-live-iso-x86_64-*-64bit": 42,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 42,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 42,
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
                 "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
                 "fedora-Server-raw_xz-raw.xz-aarch64-*-aarch64": 42,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 40,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 40,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -897,9 +901,9 @@
         },
         "desktop_background": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 22,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 22,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -916,7 +920,7 @@
         },
         "desktop_login": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 30,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 30,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 30,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -945,9 +949,9 @@
         },
         "desktop_browser": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 22,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 22,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -964,7 +968,7 @@
         },
         "desktop_notifications_live": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 32,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 32,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 30,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70
@@ -975,7 +979,7 @@
         },
         "desktop_notifications_postinstall": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 32,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 32,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 30,
@@ -990,7 +994,7 @@
         },
         "desktop_printing": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 20,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 20,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -1008,7 +1012,7 @@
         },
         "desktop_printing_builtin": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 20,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 20,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -1025,9 +1029,9 @@
         },
         "desktop_terminal": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 22,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 22,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -1045,7 +1049,7 @@
         "evince": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1062,7 +1066,7 @@
         "calculator": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1079,7 +1083,7 @@
         "clocks": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1096,7 +1100,7 @@
         "archiver": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1113,7 +1117,7 @@
         "contacts": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1130,7 +1134,7 @@
         "characters": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1147,7 +1151,7 @@
         "disks": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1164,7 +1168,7 @@
         "fonts": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
@@ -1180,7 +1184,7 @@
         "flatpak": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -1192,7 +1196,7 @@
         "gnome-panel": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
@@ -1208,7 +1212,7 @@
         "help_viewer": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1225,7 +1229,7 @@
         "maps": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1242,7 +1246,7 @@
         "nautilus": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1259,7 +1263,7 @@
         "gnome_text_editor": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1276,7 +1280,7 @@
         "sysmon": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
@@ -1292,7 +1296,7 @@
         "tour": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
@@ -1309,7 +1313,7 @@
         "weather": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
                 "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
@@ -1337,7 +1341,7 @@
         },
         "desktop_update_graphical": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 32,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 32,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 30,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 70,
@@ -1602,16 +1606,17 @@
         "install_default": {
             "profiles": {
                 "fedora-BaseOS-boot-iso-x86_64-*-uefi": 50,
+                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 21,
                 "fedora-Everything-boot-iso-ppc64le-*-ppc64le": 62,
                 "fedora-Everything-boot-iso-x86_64-*-64bit": 10,
                 "fedora-Everything-boot-iso-x86_64-*-uefi": 11,
-                "fedora-KDE-live-iso-x86_64-*-uefi": 16,
+                "fedora-KDE-live-iso-x86_64-*-64bit": 16,
                 "fedora-Server-boot-iso-aarch64-*-aarch64": 10,
                 "fedora-Server-boot-iso-ppc64le-*-ppc64le": 10,
                 "fedora-Server-boot-iso-x86_64-*-64bit": 10,
                 "fedora-Server-boot-iso-x86_64-*-uefi": 11,
                 "fedora-Server-dvd-iso-x86_64-*-uefi": 11,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 51,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 51,
                 "fedora-Workstation-live-iso-x86_64-*-uefi": 11
             },
             "settings": {
@@ -1622,16 +1627,16 @@
         "install_default_upload": {
             "profiles": {
                 "fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 20,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
-                "fedora-KDE-live-iso-x86_64-*-64bit": 15,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 15,
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 10,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 10,
                 "fedora-Server-dvd-iso-x86_64-*-64bit": 10,
                 "fedora-Server-dvd-iso-x86_64-*-uefi": 10,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 10,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 10,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 60
@@ -1866,7 +1871,7 @@
         },
         "install_no_user": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 21
+                "fedora-KDE-live-iso-x86_64-*-uefi": 21
             },
             "settings": {
                 "INSTALL_NO_USER": "1"
@@ -2338,7 +2343,7 @@
         },
         "podman": {
             "profiles": {
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 20,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40
             },
@@ -2356,7 +2361,7 @@
         },
         "podman_client": {
             "profiles": {
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 20,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40
             },
@@ -2461,17 +2466,17 @@
         },
         "release_identification": {
             "profiles": {
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
-                "fedora-KDE-live-iso-x86_64-*-64bit": 42,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 42,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 42,
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
                 "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
                 "fedora-Server-raw_xz-raw.xz-aarch64-*-aarch64": 42,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 40,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 40,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 60,
@@ -2489,11 +2494,11 @@
         },
         "rpmostree_overlay": {
             "profiles": {
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 20,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -2505,11 +2510,11 @@
         },
         "rpmostree_rebase": {
                 "profiles": {
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 20,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -2524,7 +2529,9 @@
             "profiles": {
                 "fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 30,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 30,
                 "fedora-Server-dvd-iso-x86_64-*-uefi": 30,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 50,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 60
             },
             "settings": {
@@ -2875,12 +2882,12 @@
         },
         "toolbox": {
             "profiles": {
-                "fedora-KDE-live-iso-x86_64-*-64bit": 40,
+                "fedora-KDE-live-iso-x86_64-*-uefi": 40,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 40,
                 "fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 60,
                 "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 40,
-                "fedora-CoreOS-colive-iso-x86_64-*-64bit": 40,
-                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 40
+                "fedora-CoreOS-colive-iso-x86_64-*-uefi": 40,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 40
             },
             "settings": {
                 "BOOTFROM": "c",

tests/_coreos_install.pm

@@ -8,6 +8,10 @@ sub run {
     assert_screen "user_console", 300;
     type_string "sudo su\n";
     assert_script_run "coreos-installer install /dev/vda --ignition-url https://www.happyassassin.net/temp/openqa.ign", 600;
+    # the CoreOS installer does not write an efibootmgr entry, so to
+    # ensure we boot from hard disk on next boot, wipe the entry for
+    # the optical drive
+    assert_script_run('efibootmgr -b $(efibootmgr | grep CD-ROM | head -1 | cut -f1 | sed -e "s,[^0-9],,g") -B') if (get_var("UEFI"));
     type_string "reboot\n";
 }