From 2bde9e79f095c550b27707c92da0a54a574b634d Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 22 Mar 2024 12:17:49 -0700
Subject: [PATCH] Switch all images to UEFI boot

We're moving most tests from BIOS to UEFI boot. The backing
images need to be moved accordingly. Instead of a sole UEFI
minimal image, we now have a sole BIOS minimal image.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 createhdds.py                      |  7 ++++--
 hdds.json                          | 34 ++++++++++++++++++------------
 minimal-uefi.ks => minimal-bios.ks |  0
 3 files changed, 25 insertions(+), 16 deletions(-)
 rename minimal-uefi.ks => minimal-bios.ks (100%)

diff --git a/createhdds.py b/createhdds.py
index 60ebf63..10ec09f 100755
--- a/createhdds.py
+++ b/createhdds.py
@@ -321,11 +321,14 @@ class VirtInstallImage(object):
                 loctmp = "https://download.fedoraproject.org/pub/{0}/releases/{1}/{2}/{3}/os/"
             ksfile = self.kickstart_file
             xargs = "inst.ks=file:/{0}".format(ksfile)
+            bootopts = self.bootopts
             if arch == "ppc64le":
                 # https://bugzilla.redhat.com/show_bug.cgi?id=2209760
                 # FIXME: can be dropped when we no longer create F38
                 # images for ppc64le
                 xargs += " inst.disklabel=mbr"
+                # --boot uefi breaks on ppc64le
+                bootopts = self.bootopts.replace("uefi", "")
             args = ["virt-install", "--disk", "size={0},path={1}".format(self.size, tmpfile),
                     "--os-variant", shortid, "-x", xargs, "--initrd-inject",
                     "{0}/{1}".format(SCRIPTDIR, ksfile), "--location",
@@ -334,8 +337,8 @@ class VirtInstallImage(object):
             if logger.getEffectiveLevel() == logging.DEBUG:
                 # let's get virt-install debug logs too
                 args.append("--debug")
-            if self.bootopts:
-                args.extend(("--boot", self.bootopts))
+            if bootopts:
+                args.extend(("--boot", bootopts))
             if textinst:
                 args.extend(("--graphics", "none", "--extra-args", "console=ttyS0"))
             else:
diff --git a/hdds.json b/hdds.json
index d62d90b..c4f8000 100644
--- a/hdds.json
+++ b/hdds.json
@@ -132,25 +132,25 @@
         {
             "name" : "minimal",
             "releases" : {
-                "-1" : ["x86_64", "ppc64le"],
-                "-2" : ["x86_64", "ppc64le"],
+                "-1" : ["x86_64", "aarch64", "ppc64le"],
+                "-2" : ["x86_64", "aarch64", "ppc64le"],
                 "stable": ["x86_64", "aarch64"],
                 "branched": ["x86_64", "aarch64"],
                 "rawhide": ["x86_64"]
             },
             "size" : "10",
-            "imgver": "3"
+            "imgver": "4",
+            "bootopts": "uefi"
         },
         {
-            "name" : "minimal-uefi",
+            "name" : "minimal-bios",
             "releases" : {
-                "-1" : ["x86_64", "aarch64"],
+                "-1" : ["x86_64"],
                 "-2" : ["x86_64"],
                 "branched": ["x86_64"]
             },
             "size" : "10",
-            "imgver": "3",
-            "bootopts": "uefi"
+            "imgver": "4"
         },
         {
             "name" : "desktop",
@@ -161,8 +161,9 @@
                 "rawhide": ["x86_64"]
             },
             "size" : "20",
-            "imgver": "4",
-            "variant": "Workstation"
+            "imgver": "5",
+            "variant": "Workstation",
+            "bootopts": "uefi"
         },
         {
             "name" : "desktopencrypt",
@@ -171,7 +172,9 @@
                 "branched" : ["x86_64", "aarch64"]
             },
             "size" : "20",
-            "variant": "Workstation"
+            "imgver": "2",
+            "variant": "Workstation",
+            "bootopts": "uefi"
         },
         {
             "name" : "server",
@@ -181,8 +184,9 @@
                 "rawhide": ["x86_64", "ppc64le"]
             },
             "size" : "7",
-            "imgver": "3",
-            "variant": "Server"
+            "imgver": "4",
+            "variant": "Server",
+            "bootopts": "uefi"
         },
         {
             "name" : "kde",
@@ -192,7 +196,8 @@
                 "rawhide": ["x86_64"]
             },
             "size" : "20",
-            "imgver": "4"
+            "imgver": "5",
+            "bootopts": "uefi"
         },
         {
             "name" : "support",
@@ -200,7 +205,8 @@
                 "-1" : ["x86_64", "ppc64le", "aarch64"]
             },
             "size" : "11",
-            "imgver" : "5"
+            "imgver" : "6",
+            "bootopts": "uefi"
         }
     ],
     "renames" : []
diff --git a/minimal-uefi.ks b/minimal-bios.ks
similarity index 100%
rename from minimal-uefi.ks
rename to minimal-bios.ks