From 8a5d6d73e5900473d87ebd6c81edee9fc9475947 Mon Sep 17 00:00:00 2001 From: Marcin Sobczyk Date: Thu, 25 Aug 2022 15:07:46 +0200 Subject: [PATCH 1/2] engine: Remove COPR workaround Specifying the COPR chroot explicitly is the valid way to go on both el8stream and el9stream. Signed-off-by: Marcin Sobczyk --- configs/el8stream/el8stream-provision-engine.sh.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/el8stream/el8stream-provision-engine.sh.in b/configs/el8stream/el8stream-provision-engine.sh.in index 737bde0..1bc9f2a 100644 --- a/configs/el8stream/el8stream-provision-engine.sh.in +++ b/configs/el8stream/el8stream-provision-engine.sh.in @@ -1,10 +1,6 @@ #!/bin/bash -xe -# Workaround for https://bugzilla.redhat.com/2024629 -# dnf copr enable -y ovirt/ovirt-master-snapshot -rpm --import https://download.copr.fedorainfracloud.org/results/ovirt/ovirt-master-snapshot/pubkey.gpg -dnf --repofrompath=ovirt-master-snapshot,https://download.copr.fedorainfracloud.org/results/ovirt/ovirt-master-snapshot/centos-stream-8-x86_64/ \ - install -y dnf-utils ovirt-release-master +dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-$(. /etc/os-release; echo ${VERSION_ID}) dnf module enable -y javapackages-tools pki-deps postgresql:12 mod_auth_openidc:2.3 dnf -y install \ From d18866bc86d1a77a148a7412e2649860cca5176d Mon Sep 17 00:00:00 2001 From: Marcin Sobczyk Date: Thu, 25 Aug 2022 17:16:03 +0200 Subject: [PATCH 2/2] alma9: Itroducing alma9 support This patch provides initial config for AlmaLinux 9. Similar to CentOS Stream 9, engine build is turned off at the moment. On AlmaLinux 9 'VERSION_ID' takes a value of '9.0', so we need to trim the string to match the COPR chroot name. Signed-off-by: Marcin Sobczyk --- build.sh | 1 + configs/alma9/alma9-provision-he.sh.in | 1 + configs/alma9/alma9-provision-host.sh.in | 1 + configs/alma9/alma9.ks.in | 1 + configs/alma9/build.env | 7 +++++++ configs/el8stream/el8stream-provision-engine.sh.in | 2 +- configs/el8stream/el8stream-provision-host.sh.in | 2 +- 7 files changed, 13 insertions(+), 2 deletions(-) create mode 120000 configs/alma9/alma9-provision-he.sh.in create mode 120000 configs/alma9/alma9-provision-host.sh.in create mode 120000 configs/alma9/alma9.ks.in create mode 100644 configs/alma9/build.env diff --git a/build.sh b/build.sh index a34866c..b0a58ea 100755 --- a/build.sh +++ b/build.sh @@ -20,6 +20,7 @@ echo "with node image url: ${NODE_URL_BASE:=https://resources.ovirt.org/repos/ov # cache CentOS images declare -A ISO_URL +ISO_URL[alma9]="Alma.iso" ISO_URL[el8]="CentOS.iso" ISO_URL[el8stream]="CentOS-Stream.iso" ISO_URL[el9stream]="CentOS-Stream-9.iso" diff --git a/configs/alma9/alma9-provision-he.sh.in b/configs/alma9/alma9-provision-he.sh.in new file mode 120000 index 0000000..1431a20 --- /dev/null +++ b/configs/alma9/alma9-provision-he.sh.in @@ -0,0 +1 @@ +../el9stream/el9stream-provision-he.sh.in \ No newline at end of file diff --git a/configs/alma9/alma9-provision-host.sh.in b/configs/alma9/alma9-provision-host.sh.in new file mode 120000 index 0000000..2ab84c4 --- /dev/null +++ b/configs/alma9/alma9-provision-host.sh.in @@ -0,0 +1 @@ +../el9stream/el9stream-provision-host.sh.in \ No newline at end of file diff --git a/configs/alma9/alma9.ks.in b/configs/alma9/alma9.ks.in new file mode 120000 index 0000000..0f39690 --- /dev/null +++ b/configs/alma9/alma9.ks.in @@ -0,0 +1 @@ +../el9stream/el9stream.ks.in \ No newline at end of file diff --git a/configs/alma9/build.env b/configs/alma9/build.env new file mode 100644 index 0000000..aeba8e7 --- /dev/null +++ b/configs/alma9/build.env @@ -0,0 +1,7 @@ +# See 'makefiles/vars.mk' for a list of variables that can be overriden +export REPO_ROOT=https://repo.almalinux.org/almalinux/9/ +export INSTALL_URL=../$IMAGE +export BUILD_HOST_INSTALLED=1 +export BUILD_ENGINE_INSTALLED= +export BUILD_HE_INSTALLED=${BUILD_HE_INSTALLED} +export OPENSCAP_PROFILE="${OPENSCAP_PROFILE}" diff --git a/configs/el8stream/el8stream-provision-engine.sh.in b/configs/el8stream/el8stream-provision-engine.sh.in index 1bc9f2a..9bca19e 100644 --- a/configs/el8stream/el8stream-provision-engine.sh.in +++ b/configs/el8stream/el8stream-provision-engine.sh.in @@ -1,6 +1,6 @@ #!/bin/bash -xe -dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-$(. /etc/os-release; echo ${VERSION_ID}) +dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-$(. /etc/os-release; echo ${VERSION_ID} | grep -o '^[0-9]') dnf module enable -y javapackages-tools pki-deps postgresql:12 mod_auth_openidc:2.3 dnf -y install \ diff --git a/configs/el8stream/el8stream-provision-host.sh.in b/configs/el8stream/el8stream-provision-host.sh.in index bf2130b..7f6746f 100644 --- a/configs/el8stream/el8stream-provision-host.sh.in +++ b/configs/el8stream/el8stream-provision-host.sh.in @@ -1,6 +1,6 @@ #!/bin/bash -xe -dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-$(. /etc/os-release; echo ${VERSION_ID}) +dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-$(. /etc/os-release; echo ${VERSION_ID} | grep -o '^[0-9]') dnf install -y \ dnf-utils \ ovirt-release-master