From c049499322a04a1c58bb264ae68507b82621a60e Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Fri, 13 Jan 2023 16:44:17 +0100
Subject: [PATCH] test: use kernel-rt-core in ostree tests for CS8

---
 test/cases/ostree-ng.sh                   | 7 ++++++-
 test/cases/ostree-raw-image.sh            | 8 ++++++--
 test/cases/ostree-rebase-bios.sh          | 6 +++++-
 test/cases/ostree-rebase-uefi.sh          | 6 +++++-
 test/cases/ostree-simplified-installer.sh | 8 ++++++--
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index ee912e7f7..c01aba8b2 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -92,6 +92,9 @@ SSH_DATA_DIR=$(/usr/libexec/osbuild-composer-test/gen-ssh.sh)
 SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 
+# kernel-rt package name (differs in CS8)
+KERNEL_RT_PKG="kernel-rt"
+
 case "${ID}-${VERSION_ID}" in
     "fedora-"*)
         CONTAINER_TYPE=iot-container
@@ -115,6 +118,7 @@ case "${ID}-${VERSION_ID}" in
         OSTREE_REF="test/centos/8/${ARCH}/edge"
         OS_VARIANT="centos8"
         EMBEDED_CONTAINER="true"
+        KERNEL_RT_PKG="kernel-rt-core"
         ;;
     "centos-9")
         OSTREE_REF="test/centos/9/${ARCH}/edge"
@@ -645,11 +649,12 @@ name = "wget"
 version = "*"
 EOF
 
+
 # No RT kernel in Fedora
 if [[ "$ID" != "fedora" ]]; then
     tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
 [customizations.kernel]
-name = "kernel-rt"
+name = "${KERNEL_RT_PKG}"
 EOF
 fi
 
diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh
index 0a91fbac9..f6bbeb70e 100755
--- a/test/cases/ostree-raw-image.sh
+++ b/test/cases/ostree-raw-image.sh
@@ -85,6 +85,9 @@ SSH_DATA_DIR=$(/usr/libexec/osbuild-composer-test/gen-ssh.sh)
 SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 
+# kernel-rt package name (differs in CS8)
+KERNEL_RT_PKG="kernel-rt"
+
 case "${ID}-${VERSION_ID}" in
     "rhel-8.8")
         OSTREE_REF="rhel/8/${ARCH}/edge"
@@ -97,6 +100,7 @@ case "${ID}-${VERSION_ID}" in
     "centos-8")
         OSTREE_REF="centos/8/${ARCH}/edge"
         OS_VARIANT="centos8"
+        KERNEL_RT_PKG="kernel-rt-core"
         ;;
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
@@ -295,7 +299,7 @@ EOF
 if [[ "$ID" != "fedora" ]]; then
     tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
 [customizations.kernel]
-name = "kernel-rt"
+name = "${KERNEL_RT_PKG}"
 EOF
 fi
 
@@ -604,7 +608,7 @@ EOF
 if [[ "$ID" != "fedora" ]]; then
     tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
 [customizations.kernel]
-name = "kernel-rt"
+name = "${KERNEL_RT_PKG}"
 EOF
 fi
 
diff --git a/test/cases/ostree-rebase-bios.sh b/test/cases/ostree-rebase-bios.sh
index af28dbad7..702b506c8 100755
--- a/test/cases/ostree-rebase-bios.sh
+++ b/test/cases/ostree-rebase-bios.sh
@@ -81,6 +81,9 @@ SSH_DATA_DIR=$(/usr/libexec/osbuild-composer-test/gen-ssh.sh)
 SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 
+# kernel-rt package name (differs in CS8)
+KERNEL_RT_PKG="kernel-rt"
+
 case "${ID}-${VERSION_ID}" in
     "rhel-8.8")
         OSTREE_REF="rhel/8/${ARCH}/edge"
@@ -107,6 +110,7 @@ case "${ID}-${VERSION_ID}" in
         OS_VARIANT="centos8"
         BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
         PARENT_REF="centos/8/${ARCH}/edge"
+        KERNEL_RT_PKG="kernel-rt-core"
         ;;
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
@@ -426,7 +430,7 @@ key = "${SSH_KEY_PUB}"
 groups = ["wheel"]
 
 [customizations.kernel]
-name = "kernel-rt"
+name = "${KERNEL_RT_PKG}"
 EOF
 
 greenprint "📄 upgrade blueprint"
diff --git a/test/cases/ostree-rebase-uefi.sh b/test/cases/ostree-rebase-uefi.sh
index 2c88f967d..c0697f543 100755
--- a/test/cases/ostree-rebase-uefi.sh
+++ b/test/cases/ostree-rebase-uefi.sh
@@ -81,6 +81,9 @@ SSH_DATA_DIR=$(/usr/libexec/osbuild-composer-test/gen-ssh.sh)
 SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 
+# kernel-rt package name (differs in CS8)
+KERNEL_RT_PKG="kernel-rt"
+
 case "${ID}-${VERSION_ID}" in
     "rhel-8.8")
         OSTREE_REF="rhel/8/${ARCH}/edge"
@@ -107,6 +110,7 @@ case "${ID}-${VERSION_ID}" in
         OS_VARIANT="centos8"
         BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
         PARENT_REF="centos/8/${ARCH}/edge"
+        KERNEL_RT_PKG="kernel-rt-core"
         ;;
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
@@ -429,7 +433,7 @@ key = "${SSH_KEY_PUB}"
 groups = ["wheel"]
 
 [customizations.kernel]
-name = "kernel-rt"
+name = "${KERNEL_RT_PKG}"
 EOF
 
 greenprint "📄 upgrade blueprint"
diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh
index 20da908b0..8565c80fa 100755
--- a/test/cases/ostree-simplified-installer.sh
+++ b/test/cases/ostree-simplified-installer.sh
@@ -98,6 +98,9 @@ SSH_OPTIONS=(-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o Conn
 SSH_DATA_DIR=$(/usr/libexec/osbuild-composer-test/gen-ssh.sh)
 SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
+#
+# kernel-rt package name (differs in CS8)
+KERNEL_RT_PKG="kernel-rt"
 
 case "${ID}-${VERSION_ID}" in
     "rhel-8.8")
@@ -111,6 +114,7 @@ case "${ID}-${VERSION_ID}" in
     "centos-8")
         OSTREE_REF="centos/8/${ARCH}/edge"
         OS_VARIANT="centos8"
+        KERNEL_RT_PKG="kernel-rt-core"
         ;;
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
@@ -342,7 +346,7 @@ name = "sssd"
 version = "*"
 
 [customizations.kernel]
-name = "kernel-rt"
+name = "${KERNEL_RT_PKG}"
 
 [[customizations.user]]
 name = "admin"
@@ -1323,7 +1327,7 @@ name = "wget"
 version = "*"
 
 [customizations.kernel]
-name = "kernel-rt"
+name = "${KERNEL_RT_PKG}"
 
 [[customizations.user]]
 name = "admin"