particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: use kernel-rt-core in ostree tests for CS8

Browse source
This commit is contained in:
Achilleas Koutsou 2023-01-13 16:44:17 +01:00 • committed by Tomáš Hozza
parent ca24ff4d47
commit c049499322
5 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/cases/ostree-ng.sh
View file

@ -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

8
test/cases/ostree-raw-image.sh
View file

@ -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

6
test/cases/ostree-rebase-bios.sh
View file

@ -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"

6
test/cases/ostree-rebase-uefi.sh
View file

@ -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"

8
test/cases/ostree-simplified-installer.sh
View file

@ -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"