srbala/createhdds
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/createhdds.git synced 2024-12-22 10:43:09 +00:00
Code Issues Releases Activity

Switch all images to UEFI boot

Browse Source 
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>
This commit is contained in:
Adam Williamson 2024-03-22 12:17:49 -07:00
parent b44312dfe3
commit 2bde9e79f0
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
createhdds.py
View File

@ -321,11 +321,14 @@ class VirtInstallImage(object):
loctmp = "https://download.fedoraproject.org/pub/{0}/releases/{1}/{2}/{3}/os/" loctmp = "https://download.fedoraproject.org/pub/{0}/releases/{1}/{2}/{3}/os/"
ksfile = self.kickstart_file ksfile = self.kickstart_file
xargs = "inst.ks=file:/{0}".format(ksfile) xargs = "inst.ks=file:/{0}".format(ksfile)
bootopts = self.bootopts
if arch == "ppc64le": if arch == "ppc64le":
# https://bugzilla.redhat.com/show_bug.cgi?id=2209760 # https://bugzilla.redhat.com/show_bug.cgi?id=2209760
# FIXME: can be dropped when we no longer create F38 # FIXME: can be dropped when we no longer create F38
# images for ppc64le # images for ppc64le
xargs += " inst.disklabel=mbr" 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), args = ["virt-install", "--disk", "size={0},path={1}".format(self.size, tmpfile),
"--os-variant", shortid, "-x", xargs, "--initrd-inject", "--os-variant", shortid, "-x", xargs, "--initrd-inject",
"{0}/{1}".format(SCRIPTDIR, ksfile), "--location", "{0}/{1}".format(SCRIPTDIR, ksfile), "--location",
@ -334,8 +337,8 @@ class VirtInstallImage(object):
if logger.getEffectiveLevel() == logging.DEBUG: if logger.getEffectiveLevel() == logging.DEBUG:
# let's get virt-install debug logs too # let's get virt-install debug logs too
args.append("--debug") args.append("--debug")
if self.bootopts: if bootopts:
args.extend(("--boot", self.bootopts)) args.extend(("--boot", bootopts))
if textinst: if textinst:
args.extend(("--graphics", "none", "--extra-args", "console=ttyS0")) args.extend(("--graphics", "none", "--extra-args", "console=ttyS0"))
else: else:

34
hdds.json
View File

@ -132,25 +132,25 @@
{ {
"name" : "minimal", "name" : "minimal",
"releases" : { "releases" : {
"-1" : ["x86_64", "ppc64le"], "-1" : ["x86_64", "aarch64", "ppc64le"],
"-2" : ["x86_64", "ppc64le"], "-2" : ["x86_64", "aarch64", "ppc64le"],
"stable": ["x86_64", "aarch64"], "stable": ["x86_64", "aarch64"],
"branched": ["x86_64", "aarch64"], "branched": ["x86_64", "aarch64"],
"rawhide": ["x86_64"] "rawhide": ["x86_64"]
}, },
"size" : "10", "size" : "10",
"imgver": "3" "imgver": "4",
"bootopts": "uefi"
}, },
{ {
"name" : "minimal-uefi", "name" : "minimal-bios",
"releases" : { "releases" : {
"-1" : ["x86_64", "aarch64"], "-1" : ["x86_64"],
"-2" : ["x86_64"], "-2" : ["x86_64"],
"branched": ["x86_64"] "branched": ["x86_64"]
}, },
"size" : "10", "size" : "10",
"imgver": "3", "imgver": "4"
"bootopts": "uefi"
}, },
{ {
"name" : "desktop", "name" : "desktop",
@ -161,8 +161,9 @@
"rawhide": ["x86_64"] "rawhide": ["x86_64"]
}, },
"size" : "20", "size" : "20",
"imgver": "4", "imgver": "5",
"variant": "Workstation" "variant": "Workstation",
"bootopts": "uefi"
}, },
{ {
"name" : "desktopencrypt", "name" : "desktopencrypt",
@ -171,7 +172,9 @@
"branched" : ["x86_64", "aarch64"] "branched" : ["x86_64", "aarch64"]
}, },
"size" : "20", "size" : "20",
"variant": "Workstation" "imgver": "2",
"variant": "Workstation",
"bootopts": "uefi"
}, },
{ {
"name" : "server", "name" : "server",
@ -181,8 +184,9 @@
"rawhide": ["x86_64", "ppc64le"] "rawhide": ["x86_64", "ppc64le"]
}, },
"size" : "7", "size" : "7",
"imgver": "3", "imgver": "4",
"variant": "Server" "variant": "Server",
"bootopts": "uefi"
}, },
{ {
"name" : "kde", "name" : "kde",
@ -192,7 +196,8 @@
"rawhide": ["x86_64"] "rawhide": ["x86_64"]
}, },
"size" : "20", "size" : "20",
"imgver": "4" "imgver": "5",
"bootopts": "uefi"
}, },
{ {
"name" : "support", "name" : "support",
@ -200,7 +205,8 @@
"-1" : ["x86_64", "ppc64le", "aarch64"] "-1" : ["x86_64", "ppc64le", "aarch64"]
}, },
"size" : "11", "size" : "11",
"imgver" : "5" "imgver" : "6",
"bootopts": "uefi"
} }
], ],
"renames" : [] "renames" : []

0
minimal-uefi.ks → minimal-bios.ks
View File