From 70b30cb9aa1f3607a97b352f207d3994539529b1 Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Sat, 14 May 2022 09:24:37 -0700 Subject: [PATCH 1/7] update version to 8.6 --- hdds.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hdds.json b/hdds.json index 1a53c82..4dffe24 100644 --- a/hdds.json +++ b/hdds.json @@ -125,14 +125,14 @@ { "name" : "minimal", "releases" : { - "8.5" : ["x86_64", "aarch64"] + "8.6" : ["x86_64", "aarch64"] }, "size" : "10" }, { "name" : "minimal-uefi", "releases" : { - "8.5" : ["x86_64", "aarch64"] + "8.6" : ["x86_64", "aarch64"] }, "size" : "10", "bootopts": "uefi" @@ -140,7 +140,7 @@ { "name" : "desktop", "releases" : { - "8.5": ["x86_64", "aarch64"] + "8.6": ["x86_64", "aarch64"] }, "size" : "20", "variant": "Workstation" @@ -148,7 +148,7 @@ { "name" : "desktopencrypt", "releases" : { - "8.5" : ["x86_64", "aarch64"] + "8.6" : ["x86_64", "aarch64"] }, "size" : "20", "variant": "Workstation" @@ -156,7 +156,7 @@ { "name" : "server", "releases" : { - "8.5" : ["x86_64", "aarch64"] + "8.6" : ["x86_64", "aarch64"] }, "size" : "7", "variant": "Server" @@ -164,7 +164,7 @@ { "name" : "support", "releases" : { - "8.5" : ["x86_64", "aarch64"] + "8.6" : ["x86_64", "aarch64"] }, "size" : "11" } From 1a8c4e605e15005fc25fdc70f6f863954ec89e9d Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Sat, 14 May 2022 09:48:06 -0700 Subject: [PATCH 2/7] increased disk sizes to match openQA #87 --- hdds.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hdds.json b/hdds.json index 4dffe24..7beaa38 100644 --- a/hdds.json +++ b/hdds.json @@ -127,14 +127,14 @@ "releases" : { "8.6" : ["x86_64", "aarch64"] }, - "size" : "10" + "size" : "15" }, { "name" : "minimal-uefi", "releases" : { "8.6" : ["x86_64", "aarch64"] }, - "size" : "10", + "size" : "15", "bootopts": "uefi" }, { @@ -158,7 +158,7 @@ "releases" : { "8.6" : ["x86_64", "aarch64"] }, - "size" : "7", + "size" : "9", "variant": "Server" }, { @@ -166,7 +166,7 @@ "releases" : { "8.6" : ["x86_64", "aarch64"] }, - "size" : "11" + "size" : "15" } ], "renames" : [] From 824de0a3f8f73e6165d874281dc2c9dd31028685 Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Sat, 14 May 2022 13:23:19 -0700 Subject: [PATCH 3/7] correct 'unknown' os-variant for Rocky 8 --- createhdds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/createhdds.py b/createhdds.py index 20ff788..b47f5c7 100755 --- a/createhdds.py +++ b/createhdds.py @@ -265,7 +265,7 @@ class VirtInstallImage(object): if shortid not in out: # this will just use the most recent rocky release number # virt-install / osinfo knows - shortid = 'rocky-unknown' + shortid = 'rocky8-unknown' # destroy and delete the domain we use for all virt-installs conn = libvirt.open() From 6c279c92b37f8068cf8626da495944a384711dd8 Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Sat, 14 May 2022 13:23:48 -0700 Subject: [PATCH 4/7] leave a hint about where/how to use stg instead of pub --- createhdds.py | 1 + 1 file changed, 1 insertion(+) diff --git a/createhdds.py b/createhdds.py index b47f5c7..28b99b6 100755 --- a/createhdds.py +++ b/createhdds.py @@ -302,6 +302,7 @@ class VirtInstallImage(object): variant = 'Everything' try: # loctmp is the Distribution tree installation source. Point at the good location + #loctmp = "https://download.rockylinux.org/stg/rocky/{0}/BaseOS/{1}/os" loctmp = "https://download.rockylinux.org/pub/rocky/{0}/BaseOS/{1}/os" ksfile = self.kickstart_file xargs = "inst.ks=file:/{0}".format(ksfile) From 70cfdcffa6496cf9559288ec0a049f29a16d010b Mon Sep 17 00:00:00 2001 From: Al Bowles Date: Sat, 14 May 2022 15:38:59 -0500 Subject: [PATCH 5/7] Increase size of disk_full.img --- hdds.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hdds.json b/hdds.json index 7beaa38..dd0a801 100644 --- a/hdds.json +++ b/hdds.json @@ -2,19 +2,19 @@ "guestfs" : [ { "name" : "full", - "size" : "10G", + "size" : "25G", "labels" : ["mbr", "gpt"], "parts" : [ { "filesystem" : "ext4", "type" : "p", "start" : "4096", - "end" : "10485760" + "end" : "26214400" }, { "filesystem" : "ext4", "type" : "p", - "start" : "10485761", + "start" : "26214401", "end" : "-4097" } ], From ef0d3aea149f4862df2bc65292119acfac2b778c Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Thu, 19 May 2022 12:53:09 -0700 Subject: [PATCH 6/7] feat: improvements for createhdds (#5) --- createhdds.py | 27 +++------------------------ hdds.json | 27 +++++++++++++++------------ 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/createhdds.py b/createhdds.py index 28b99b6..37c2b48 100755 --- a/createhdds.py +++ b/createhdds.py @@ -197,8 +197,7 @@ class GuestfsImage(object): class VirtInstallImage(object): """Class representing an image created by virt-install. 'release' - is the release the image will be built for. 'variant' is the - variant whose install tree should be used. 'arch' is the arch. + is the release the image will be built for. 'arch' is the arch. 'size' is the desired image size, in gigabytes. 'imgver' is the image 'version' - in practice it's simply a string that gets included in the image file name if specified. 'maxage' is the @@ -207,7 +206,7 @@ class VirtInstallImage(object): rebuild it. 'bootopts' are used to pass boot options to the virtual image to provide better control of the VM. """ - def __init__(self, name, release, arch, size, variant=None, imgver='', maxage=14, bootopts=None): + def __init__(self, name, release, arch, size, imgver='', maxage=14, bootopts=None): self.name = name self.size = size self.filename = "disk_rocky{0}_{1}".format(str(release), name) @@ -215,16 +214,8 @@ class VirtInstallImage(object): self.filename = "{0}_{1}".format(self.filename, imgver) self.filename = "{0}_{1}.qcow2".format(self.filename, arch) self.release = release - self.variant = variant self.arch = arch self.maxage = maxage - if variant: - self.variant = variant - else: - if str(release).isdigit() and int(release) < 24: - self.variant = "Server" - else: - self.variant = "Everything" self.bootopts = bootopts @property @@ -286,20 +277,10 @@ class VirtInstallImage(object): arch = self.arch rockydir = 'rocky/linux' memsize = '3072' - if arch == 'i686': - arch = 'i386' if arch in ['ppc64','ppc64le']: rockydir = 'rocky-secondary' memsize = '4096' - if arch == 'i386': - # i686 is in rocky-secondary (until it died) - rockydir = 'rocky-secondary' - variant = self.variant - # From F31 onwards, Workstation tree is not installable and we - # build Workstation images out of Everything - # We will always use the dvd1 ISO and the closest behavior is the Everything variant - variant = 'Everything' try: # loctmp is the Distribution tree installation source. Point at the good location #loctmp = "https://download.rockylinux.org/stg/rocky/{0}/BaseOS/{1}/os" @@ -475,8 +456,6 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None): name = imggrp['name'] # this is the second place we set a default for maxage - bit ugly maxage = int(imggrp.get('maxage', 14)) - # ditto variant - variant = imggrp.get('variant') if not releases: releases = imggrp['releases'] size = imggrp.get('size', 0) @@ -491,7 +470,7 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None): continue key = "{0}-{1}".format(rel, arch) # using a dict here avoids dupes - imgs[key] = VirtInstallImage(name, rel, arch, variant=variant, size=size, + imgs[key] = VirtInstallImage(name, rel, arch, size=size, imgver=imgver, maxage=maxage, bootopts=bootopts) return list(imgs.values()) diff --git a/hdds.json b/hdds.json index dd0a801..bdf7aa4 100644 --- a/hdds.json +++ b/hdds.json @@ -125,14 +125,16 @@ { "name" : "minimal", "releases" : { - "8.6" : ["x86_64", "aarch64"] + "8" : ["x86_64", "aarch64"], + "9" : ["x86_64", "aarch64"] }, "size" : "15" }, { "name" : "minimal-uefi", "releases" : { - "8.6" : ["x86_64", "aarch64"] + "8" : ["x86_64", "aarch64"], + "9" : ["x86_64", "aarch64"] }, "size" : "15", "bootopts": "uefi" @@ -140,31 +142,32 @@ { "name" : "desktop", "releases" : { - "8.6": ["x86_64", "aarch64"] + "8": ["x86_64", "aarch64"], + "9" : ["x86_64", "aarch64"] }, - "size" : "20", - "variant": "Workstation" + "size" : "20" }, { "name" : "desktopencrypt", "releases" : { - "8.6" : ["x86_64", "aarch64"] + "8" : ["x86_64", "aarch64"], + "9" : ["x86_64", "aarch64"] }, - "size" : "20", - "variant": "Workstation" + "size" : "20" }, { "name" : "server", "releases" : { - "8.6" : ["x86_64", "aarch64"] + "8" : ["x86_64", "aarch64"], + "9" : ["x86_64", "aarch64"] }, - "size" : "9", - "variant": "Server" + "size" : "9" }, { "name" : "support", "releases" : { - "8.6" : ["x86_64", "aarch64"] + "8" : ["x86_64", "aarch64"], + "9" : ["x86_64", "aarch64"] }, "size" : "15" } From 53624d2dd54c0265f6b63b842021c25e1df45a37 Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Tue, 16 Aug 2022 07:31:01 -0700 Subject: [PATCH 7/7] feat: add temporary support for Rocky Linux 9 (#9) --- createhdds.py | 2 +- desktop.ks | 2 +- desktopencrypt-aarch64.ks | 2 +- desktopencrypt.ks | 2 +- minimal-uefi.ks | 2 +- minimal.ks | 2 +- server.ks | 2 +- support.ks | 2 +- uploads/root-user-crypted-net.ks | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/createhdds.py b/createhdds.py index 37c2b48..d7ea224 100755 --- a/createhdds.py +++ b/createhdds.py @@ -256,7 +256,7 @@ class VirtInstallImage(object): if shortid not in out: # this will just use the most recent rocky release number # virt-install / osinfo knows - shortid = 'rocky8-unknown' + shortid = "rocky{0}".format(self.release).split('.')[0] + "-unknown" # destroy and delete the domain we use for all virt-installs conn = libvirt.open() diff --git a/desktop.ks b/desktop.ks index 7dac1b9..016a0fd 100644 --- a/desktop.ks +++ b/desktop.ks @@ -1,6 +1,6 @@ bootloader --location=mbr network --bootproto=dhcp -url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/" +url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/" lang en_US.UTF-8 keyboard us timezone --utc America/New_York diff --git a/desktopencrypt-aarch64.ks b/desktopencrypt-aarch64.ks index ebf3512..c34a326 100644 --- a/desktopencrypt-aarch64.ks +++ b/desktopencrypt-aarch64.ks @@ -1,6 +1,6 @@ bootloader --location=mbr --append="console=tty0 quiet" network --bootproto=dhcp -url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/" +url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/" lang en_US.UTF-8 keyboard us timezone --utc America/New_York diff --git a/desktopencrypt.ks b/desktopencrypt.ks index 3e54a89..47c68b3 100644 --- a/desktopencrypt.ks +++ b/desktopencrypt.ks @@ -1,6 +1,6 @@ bootloader --location=mbr network --bootproto=dhcp -url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/" +url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/" lang en_US.UTF-8 keyboard us timezone --utc America/New_York diff --git a/minimal-uefi.ks b/minimal-uefi.ks index d415c5d..d0273e4 100644 --- a/minimal-uefi.ks +++ b/minimal-uefi.ks @@ -1,6 +1,6 @@ bootloader --location=mbr network --bootproto=dhcp -url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/" +url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/" lang en_US.UTF-8 keyboard us timezone --utc America/New_York diff --git a/minimal.ks b/minimal.ks index fe12163..19331b5 100644 --- a/minimal.ks +++ b/minimal.ks @@ -1,6 +1,6 @@ bootloader --location=mbr network --bootproto=dhcp -url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/" +url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/" lang en_US.UTF-8 keyboard us timezone --utc America/New_York diff --git a/server.ks b/server.ks index e30eb92..9b9daa2 100644 --- a/server.ks +++ b/server.ks @@ -1,6 +1,6 @@ bootloader --location=mbr network --bootproto=dhcp -url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/" +url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/" lang en_US.UTF-8 keyboard us timezone --utc America/New_York diff --git a/support.ks b/support.ks index 5051098..c3d60fe 100644 --- a/support.ks +++ b/support.ks @@ -1,6 +1,6 @@ bootloader --location=mbr network --bootproto=dhcp -url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/" +url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/" #repo --name="epel" --baseurl="http://mirrors.kernel.org/fedora-epel/8/Everything/x86_64/" # use epel to keep scsi-target-utils instead of targetcli lang en_US.UTF-8 diff --git a/uploads/root-user-crypted-net.ks b/uploads/root-user-crypted-net.ks index b77295b..7ba019c 100644 --- a/uploads/root-user-crypted-net.ks +++ b/uploads/root-user-crypted-net.ks @@ -1,6 +1,6 @@ bootloader --location=mbr network --device=link --activate --bootproto=dhcp -url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/" +url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/" lang en_US.UTF-8 keyboard us timezone --utc America/New_York