tests/CI: Add runners for RHEL 9.7 and 10.1

Add runners for RHEL 9.7 and 10.1 and remove 9.6 and 10.0 runners.
This commit is contained in:
Tom Koscielniak 2025-06-02 11:16:53 +02:00 committed by Tomáš Hozza
parent d0e805e8be
commit 557d5f440c
49 changed files with 511903 additions and 190 deletions

View file

@ -39,7 +39,7 @@ do
done
# Prepare service api server config filef
sudo /usr/local/bin/yq -iy '.service_info.diskencryption_clevis |= [{disk_label: "/dev/vda4", reencrypt: true, binding: {pin: "tpm2", config: "{}"}}]' /etc/fdo/aio/configs/serviceinfo_api_server.yml
if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.7" || "$VERSION_ID" == "9" ]]; then
# Modify manufacturing server config to process fdo
# guest interface during onboarding
sudo sed -i 's/SerialNumber/MACAddress/g' /etc/fdo/aio/configs/manufacturing_server.yml
@ -622,7 +622,7 @@ manufacturing_server_url="http://${FDO_SERVER_ADDRESS}:8080"
diun_pub_key_insecure="true"
EOF
if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.7" || "$VERSION_ID" == "9" ]]; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
EOF
@ -807,7 +807,7 @@ manufacturing_server_url="http://${FDO_SERVER_ADDRESS}:8080"
diun_pub_key_hash="${DIUN_PUB_KEY_HASH}"
EOF
if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.7" || "$VERSION_ID" == "9" ]]; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
EOF
@ -992,7 +992,7 @@ diun_pub_key_root_certs="""
${DIUN_PUB_KEY_ROOT_CERTS}"""
EOF
if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.7" || "$VERSION_ID" == "9" ]]; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
EOF

View file

@ -56,7 +56,7 @@ case "${ID}-${VERSION_ID}" in
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
fi
;;
"rhel-9.6")
"rhel-9.7")
IMAGE_TYPE=edge-commit
OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"

View file

@ -63,8 +63,8 @@ case "${ID}-${VERSION_ID}" in
VIRT_APPSTREAM_REPO_URL="http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/AppStream/x86_64/os/"
;;
rhel-10*)
VIRT_BASEOS_REPO_URL="http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.6.0/compose/BaseOS/x86_64/os/"
VIRT_APPSTREAM_REPO_URL="http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.6.0/compose/AppStream/x86_64/os/"
VIRT_BASEOS_REPO_URL="http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.7.0/compose/BaseOS/x86_64/os/"
VIRT_APPSTREAM_REPO_URL="http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.7.0/compose/AppStream/x86_64/os/"
;;
*)
redprint "unsupported distro: ${ID}-${VERSION_ID}"

View file

@ -5,7 +5,7 @@
# This test case verifies that distributions can be specified with and without
# the dot to sepratae the major and minor version (true for RHEL-8 and RHEL-9).
# It also verifies the behavior of distro name aliases
# (e.g. "rhel-9" -> "rhel-9.6"). This is done by building a SAP image and
# (e.g. "rhel-9" -> "rhel-9.7"). This is done by building a SAP image and
# inspecting it using guestfish. Specifically, the SAP image contains DNF VAR
# config /etc/dnf/vars/releasever, which contains value "X.Y", which should be
# the same as the distro release that the alias points to.
@ -46,7 +46,7 @@ cat <<EOF | tee "${EXTRA_COMPOSER_CONF}"
# overrides the default rhel-8 alias
[distro_aliases]
rhel-8 = "rhel-8.8"
rhel-9 = "rhel-9.6"
rhel-9 = "rhel-9.7"
EOF
# Provision the software under test.