Switch IoT tests to all run on UEFI

It doesn't support BIOS any more...

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

templates.fif.json

@@ -477,10 +477,6 @@
             "machine": "aarch64",
             "product": "fedora-IoT-dvd_ostree-iso-aarch64-*"
         },
-        "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": {
-            "machine": "64bit",
-            "product": "fedora-IoT-dvd_ostree-iso-x86_64-*"
-        },
         "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": {
             "machine": "uefi",
             "product": "fedora-IoT-dvd_ostree-iso-x86_64-*"
@@ -646,7 +642,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 20,
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 20,
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
                 "fedora-KDE-live-iso-x86_64-*-64bit": 22,
                 "fedora-Minimal-raw_xz-raw.xz-arm-*-ARM": 22,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 22,
@@ -679,7 +675,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 20,
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 20,
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
                 "fedora-KDE-live-iso-x86_64-*-64bit": 22,
                 "fedora-Minimal-raw_xz-raw.xz-arm-*-ARM": 22,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 22,
@@ -769,7 +765,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 40,
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40,
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
                 "fedora-KDE-live-iso-x86_64-*-64bit": 42,
                 "fedora-Minimal-raw_xz-raw.xz-arm-*-ARM": 42,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 42,
@@ -802,7 +798,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 40,
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40,
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
                 "fedora-KDE-live-iso-x86_64-*-64bit": 42,
                 "fedora-Minimal-raw_xz-raw.xz-arm-*-ARM": 42,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 42,
@@ -835,7 +831,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 40,
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40,
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
                 "fedora-KDE-live-iso-x86_64-*-64bit": 42,
                 "fedora-Minimal-raw_xz-raw.xz-arm-*-ARM": 42,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 42,
@@ -1365,7 +1361,6 @@
         },
         "install_default": {
             "profiles": {
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 21,
                 "fedora-Everything-boot-iso-ppc64le-*-ppc64le": 62,
                 "fedora-Everything-boot-iso-x86_64-*-64bit": 10,
                 "fedora-Everything-boot-iso-x86_64-*-uefi": 11,
@@ -1387,7 +1382,7 @@
             "profiles": {
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 20,
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
                 "fedora-KDE-live-iso-x86_64-*-64bit": 15,
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 10,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 10,
@@ -1971,7 +1966,7 @@
         "iot_clevis": {
             "profiles": {
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 20
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20
             },
             "settings": {
                 "ENCRYPT_PASSWORD": "weakpassword",
@@ -1984,7 +1979,7 @@
         "iot_greenboot": {
             "profiles": {
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 20
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -1997,7 +1992,7 @@
         "iot_rpmostree_overlay": {
             "profiles": {
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 20
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -2010,7 +2005,7 @@
         "iot_rpmostree_rebase": {
                 "profiles": {
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -2024,7 +2019,7 @@
         "iot_zezere_ignition": {
                 "profiles": {
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -2043,7 +2038,7 @@
         "iot_zezere_server": {
             "profiles": {
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -2120,7 +2115,7 @@
             "profiles": {
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -2138,7 +2133,7 @@
             "profiles": {
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -2195,7 +2190,7 @@
             "profiles": {
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40,
+                "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
                 "fedora-KDE-live-iso-x86_64-*-64bit": 42,
                 "fedora-Minimal-raw_xz-raw.xz-arm-*-ARM": 42,
                 "fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 42,