Switch testing to 8.10 and 9.4 nightly

This commit is contained in:
Jakub Rusz 2023-11-01 12:45:37 +01:00 committed by Jakub Rusz
parent c77b73a888
commit 04ba4b81d8
12 changed files with 50 additions and 60 deletions

View file

@ -110,8 +110,8 @@ ALL_DISTROS=$(find "$REPO_PATH" -name '*.json' -printf '%P\n' | awk -F "." '{ pr
ALL_EXPECTED_DISTROS=$(echo "$ALL_DISTROS" | grep -E "$PATTERN" | grep -Ev 'beta|stream' | sort)
# Warning: filter out the remaining distros by matching whole words to avoid matching
# the value rhel-93 by the pattern rhel-9!
# If we're running on a RHEL 9.2 osbuild-composer doesn't know anything about 9.3
# images so the value rhel-9.3 should be treated as unrecognized and error out as
# If we're running on a RHEL 9.3 osbuild-composer doesn't know anything about 9.4
# images so the value rhel-9.4 should be treated as unrecognized and error out as
# expected in the test snippet further below
ALL_REMAINDERS=$(echo "$ALL_DISTROS" | grep -vw "$RECOGNIZED_DISTROS")

View file

@ -369,7 +369,7 @@ sudo chown qemu:qemu "$VIRT_LOG"
greenprint "💿 Install image via installer(ISO) on VM"
sudo virt-install --name="${IMAGE_KEY}"\
--disk path="${LIBVIRT_IMAGE_PATH}",format=qcow2 \
--ram 3072 \
--ram 2048 \
--vcpus 2 \
--network network=integration,mac=34:49:22:B0:83:30 \
--os-variant ${OS_VARIANT} \

View file

@ -86,10 +86,10 @@ SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
EDGE_USER_PASSWORD=foobar
case "${ID}-${VERSION_ID}" in
"rhel-8.9")
"rhel-8.10")
OS_VARIANT="rhel8-unknown"
;;
"rhel-9.3")
"rhel-9.4")
OS_VARIANT="rhel9-unknown"
;;
"centos-8")

View file

@ -12,7 +12,7 @@ source /etc/os-release
source /usr/libexec/tests/osbuild-composer/shared_lib.sh
# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
if [[ "$VERSION_ID" == "9.3" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.4" || "$VERSION_ID" == "9" ]]; then
sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
LIBVIRTD_ARGS=
EOF

View file

@ -80,7 +80,7 @@ SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
IGNITION_USER=core
case "${ID}-${VERSION_ID}" in
"rhel-9.3")
"rhel-9.4")
OSTREE_REF="rhel/9/${ARCH}/edge"
SYSROOT_RO="true"
;;

View file

@ -116,7 +116,7 @@ IGNITION_USER_PASSWORD=foobar
SYSROOT_RO="true"
case "${ID}-${VERSION_ID}" in
"rhel-9.3")
"rhel-9.4")
OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"
;;

View file

@ -15,7 +15,7 @@ fi
# Set os-variant and boot location used by virt-install.
case "${ID}-${VERSION_ID}" in
"rhel-9.3")
"rhel-9.4")
IMAGE_TYPE=edge-commit
OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"

View file

@ -66,7 +66,7 @@ case "${ID}-${VERSION_ID}" in
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
fi
;;
"rhel-8.9")
"rhel-8.10")
IMAGE_TYPE=edge-commit
OSTREE_REF="rhel/8/${ARCH}/edge"
OS_VARIANT="rhel8-unknown"
@ -108,7 +108,7 @@ case "${ID}-${VERSION_ID}" in
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
fi
;;
"rhel-9.3")
"rhel-9.4")
IMAGE_TYPE=edge-commit
OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"