From a569af3ed06146e1ce1b2aa975f1caf688132a51 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Oct 30 2020 22:57:24 +0000
Subject: Enable more base tests on aarch64 images, fix up priorities a bit


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

---

diff --git a/templates.fif.json b/templates.fif.json
index c933e1d..6e7add3 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -523,17 +523,21 @@
                 "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-CoreOS-colive-iso-x86_64-*-64bit": 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-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,
                 "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-Workstation-live-iso-ppc64le-*-ppc64le": 20,
-                "fedora-Workstation-live-iso-x86_64-*-64bit": 20
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -549,17 +553,21 @@
                 "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-CoreOS-colive-iso-x86_64-*-64bit": 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-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,
                 "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-Workstation-live-iso-ppc64le-*-ppc64le": 20,
-                "fedora-Workstation-live-iso-x86_64-*-64bit": 20
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -576,11 +584,15 @@
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 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,
                 "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-Workstation-live-iso-ppc64le-*-ppc64le": 20,
-                "fedora-Workstation-live-iso-x86_64-*-64bit": 20
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -596,7 +608,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-CoreOS-colive-iso-x86_64-*-64bit": 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-KDE-live-iso-x86_64-*-64bit": 42,
@@ -626,17 +638,21 @@
                 "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-CoreOS-colive-iso-x86_64-*-64bit": 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-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,
                 "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-Workstation-live-iso-ppc64le-*-ppc64le": 40,
-                "fedora-Workstation-live-iso-x86_64-*-64bit": 40
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 40,
+                "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 42
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -652,17 +668,21 @@
                 "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-CoreOS-colive-iso-x86_64-*-64bit": 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-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,
                 "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-Workstation-live-iso-ppc64le-*-ppc64le": 40,
-                "fedora-Workstation-live-iso-x86_64-*-64bit": 40
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 40,
+                "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 42
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -1808,16 +1828,21 @@
         },
         "release_identification": {
             "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-KDE-live-iso-x86_64-*-64bit": 50,
-                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Server-dvd-iso-x86_64-*-64bit": 50,
+                "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-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,
+                "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-Workstation-live-iso-ppc64le-*-ppc64le": 50,
-                "fedora-Workstation-live-iso-x86_64-*-64bit": 50
+                "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 40,
+                "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 42
             },
             "settings": {
                 "BOOTFROM": "c",