From 910fbf2c2fc9880ad67d8a8af007ba2cdaa97a52 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 21 Jul 2021 14:21:04 -0700
Subject: [PATCH] Also run Cloud tests on x86_64 UEFI, on Rawhide only

Cloud images are now BIOS/UEFI hybrid in Rawhide (but not F33
or F34), so we want to run the Cloud tests on UEFI as well, but
only on Rawhide.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 schemas/fif-version.json |  2 +-
 templates.fif.json       | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/schemas/fif-version.json b/schemas/fif-version.json
index 771ee67a..c08fc9b5 100644
--- a/schemas/fif-version.json
+++ b/schemas/fif-version.json
@@ -3,5 +3,5 @@
   "$id": "fif-version.json",
   "title": "FIF version schema",
   "type": "string",
-  "pattern": "^([*]|[[:digit:]]{1,3})$"
+  "pattern": "^([*]|[[:digit:]]{1,3}|Rawhide)$"
 }
diff --git a/templates.fif.json b/templates.fif.json
index ff5eb7bd..ecff7f9d 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -121,6 +121,20 @@
             },
             "version": "*"
         },
+        "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "Cloud_Base-qcow2-qcow2",
+            "settings": {
+                "BOOTFROM": "c",
+                "DEPLOY_UPLOAD_TEST": "",
+                "+HDD_1": "%HDD_2%",
+                "ISO": "cloudinit.iso",
+                "ROOT_PASSWORD": "weakpassword",
+                "TEST_TARGET": "HDD_1"
+            },
+            "version": "Rawhide"
+        },
         "fedora-CoreOS-colive-iso-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
@@ -411,6 +425,14 @@
             "machine": "64bit",
             "product": "fedora-Cloud_Base-qcow2-qcow2-x86_64-*"
         },
+        "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-64bit": {
+            "machine": "64bit",
+            "product": "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide"
+        },
+        "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": {
+            "machine": "uefi",
+            "product": "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide"
+        },
         "fedora-CoreOS-colive-iso-x86_64-*-64bit": {
             "machine": "64bit",
             "product": "fedora-CoreOS-colive-iso-x86_64-*"
@@ -587,6 +609,8 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 20,
+                "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-64bit": 20,
+                "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,
@@ -617,6 +641,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 20,
+                "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,
@@ -647,6 +672,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 20,
+                "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-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,
@@ -672,6 +698,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
+                "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-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,
@@ -697,6 +724,8 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
+                "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-64bit": 40,
+                "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,
@@ -727,6 +756,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
+                "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,
@@ -757,6 +787,7 @@
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
+                "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,
@@ -786,7 +817,8 @@
             "profiles": {
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 30,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 30,
-                "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 30
+                "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 30,
+                "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 30
             },
             "settings": {
                 "POSTINSTALL": "autocloud"