From a8df4879ac270cc91c6c5ddefbf2bd8fd027e216 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Mon, 14 Nov 2022 14:50:48 +0200 Subject: [PATCH] Adjust tests for 8.8 and 9.2 --- test/cases/oscap.sh | 4 ++-- test/cases/ostree-ng.sh | 4 ++-- test/cases/ostree-raw-image.sh | 6 ++++-- test/cases/ostree-rebase-bios.sh | 8 ++++---- test/cases/ostree-rebase-uefi.sh | 8 ++++---- test/cases/ostree-simplified-installer.sh | 4 ++-- test/cases/ostree.sh | 14 +++++++------- test/cases/upgrade8to9.sh | 6 +++--- test/data/upgrade8to9/upgrade_prepare.sh | 4 ++-- 9 files changed, 30 insertions(+), 28 deletions(-) diff --git a/test/cases/oscap.sh b/test/cases/oscap.sh index db9208763..fa5c651f7 100755 --- a/test/cases/oscap.sh +++ b/test/cases/oscap.sh @@ -77,12 +77,12 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa SSH_KEY_PUB=$(cat "${SSH_KEY}".pub) case "${ID}-${VERSION_ID}" in - "rhel-8.7") + "rhel-8.8") OS_VARIANT="rhel8-unknown" PROFILE="xccdf_org.ssgproject.content_profile_cis" DATASTREAM="/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml" ;; - "rhel-9.1") + "rhel-9.2") OS_VARIANT="rhel9-unknown" PROFILE="xccdf_org.ssgproject.content_profile_cis" DATASTREAM="/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml" diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh index 2a30fdfc6..7228c7a7e 100755 --- a/test/cases/ostree-ng.sh +++ b/test/cases/ostree-ng.sh @@ -101,12 +101,12 @@ case "${ID}-${VERSION_ID}" in OS_VARIANT="fedora-unknown" EMBEDED_CONTAINER="false" ;; - "rhel-8.7") + "rhel-8.8") OSTREE_REF="test/rhel/8/${ARCH}/edge" OS_VARIANT="rhel8-unknown" EMBEDED_CONTAINER="true" ;; - "rhel-9.1") + "rhel-9.2") OSTREE_REF="test/rhel/9/${ARCH}/edge" OS_VARIANT="rhel9-unknown" EMBEDED_CONTAINER="true" diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh index 243307ed6..0a91fbac9 100755 --- a/test/cases/ostree-raw-image.sh +++ b/test/cases/ostree-raw-image.sh @@ -86,11 +86,11 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa SSH_KEY_PUB=$(cat "${SSH_KEY}".pub) case "${ID}-${VERSION_ID}" in - "rhel-8.7") + "rhel-8.8") OSTREE_REF="rhel/8/${ARCH}/edge" OS_VARIANT="rhel8-unknown" ;; - "rhel-9.1") + "rhel-9.2") OSTREE_REF="rhel/9/${ARCH}/edge" OS_VARIANT="rhel9-unknown" ;; @@ -299,6 +299,8 @@ name = "kernel-rt" EOF fi +# TODO: remove this workaround + # User in raw image blueprint is not for RHEL 9.1 and 8.7 # Workaround for RHEL 9.1 and 8.7 nightly test # Check osbuild-composer version first diff --git a/test/cases/ostree-rebase-bios.sh b/test/cases/ostree-rebase-bios.sh index cd901cb21..c3eb678b9 100755 --- a/test/cases/ostree-rebase-bios.sh +++ b/test/cases/ostree-rebase-bios.sh @@ -82,21 +82,21 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa SSH_KEY_PUB=$(cat "${SSH_KEY}".pub) case "${ID}-${VERSION_ID}" in - "rhel-8.7") + "rhel-8.8") OSTREE_REF="rhel/8/${ARCH}/edge" OS_VARIANT="rhel8-unknown" # Use a stable installer image unless it's the nightly pipeline - BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.6.0/BaseOS/x86_64/os/" + BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.7.0/BaseOS/x86_64/os/" if [ "${NIGHTLY:=false}" == "true" ]; then BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/" fi PARENT_REF="rhel/8/${ARCH}/edge" ;; - "rhel-9.1") + "rhel-9.2") OSTREE_REF="rhel/9/${ARCH}/edge" OS_VARIANT="rhel9-unknown" # Use a stable installer image unless it's the nightly pipeline - BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.0.0/BaseOS/x86_64/os/" + BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.1.0/BaseOS/x86_64/os/" if [ "${NIGHTLY:=false}" == "true" ]; then BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/" fi diff --git a/test/cases/ostree-rebase-uefi.sh b/test/cases/ostree-rebase-uefi.sh index f06cb7c9e..52c76a543 100755 --- a/test/cases/ostree-rebase-uefi.sh +++ b/test/cases/ostree-rebase-uefi.sh @@ -82,21 +82,21 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa SSH_KEY_PUB=$(cat "${SSH_KEY}".pub) case "${ID}-${VERSION_ID}" in - "rhel-8.7") + "rhel-8.8") OSTREE_REF="rhel/8/${ARCH}/edge" OS_VARIANT="rhel8-unknown" # Use a stable installer image unless it's the nightly pipeline - BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.6.0/BaseOS/x86_64/os/" + BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.7.0/BaseOS/x86_64/os/" if [ "${NIGHTLY:=false}" == "true" ]; then BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/" fi PARENT_REF="rhel/8/${ARCH}/edge" ;; - "rhel-9.1") + "rhel-9.2") OSTREE_REF="rhel/9/${ARCH}/edge" OS_VARIANT="rhel9-unknown" # Use a stable installer image unless it's the nightly pipeline - BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.0.0/BaseOS/x86_64/os/" + BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.1.0/BaseOS/x86_64/os/" if [ "${NIGHTLY:=false}" == "true" ]; then BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/" fi diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh index ab8bc3656..f034cda1d 100755 --- a/test/cases/ostree-simplified-installer.sh +++ b/test/cases/ostree-simplified-installer.sh @@ -98,11 +98,11 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa SSH_KEY_PUB=$(cat "${SSH_KEY}".pub) case "${ID}-${VERSION_ID}" in - "rhel-8.7") + "rhel-8.8") OSTREE_REF="rhel/8/${ARCH}/edge" OS_VARIANT="rhel8-unknown" ;; - "rhel-9.1") + "rhel-9.2") OSTREE_REF="rhel/9/${ARCH}/edge" OS_VARIANT="rhel9-unknown" ;; diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh index 77514c5be..0de71a2ca 100755 --- a/test/cases/ostree.sh +++ b/test/cases/ostree.sh @@ -45,16 +45,16 @@ case "${ID}-${VERSION_ID}" in EMBEDED_CONTAINER="false" FIREWALL_FEATURE="false" ;; - "rhel-8.6") + "rhel-8.7") IMAGE_TYPE=edge-commit OSTREE_REF="rhel/8/${ARCH}/edge" OS_VARIANT="rhel8-unknown" USER_IN_COMMIT="true" - BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.6.0/BaseOS/x86_64/os/" + BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.7.0/BaseOS/x86_64/os/" EMBEDED_CONTAINER="false" FIREWALL_FEATURE="false" ;; - "rhel-8.7") + "rhel-8.8") IMAGE_TYPE=edge-commit OSTREE_REF="rhel/8/${ARCH}/edge" OS_VARIANT="rhel8-unknown" @@ -68,16 +68,16 @@ case "${ID}-${VERSION_ID}" in BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/" fi ;; - "rhel-9.0") + "rhel-9.1") IMAGE_TYPE=edge-commit OSTREE_REF="rhel/9/${ARCH}/edge" - OS_VARIANT="rhel9.0" + OS_VARIANT="rhel9.1" USER_IN_COMMIT="true" - BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.0.0/BaseOS/x86_64/os/" + BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.1.0/BaseOS/x86_64/os/" EMBEDED_CONTAINER="false" FIREWALL_FEATURE="false" ;; - "rhel-9.1") + "rhel-9.2") IMAGE_TYPE=edge-commit OSTREE_REF="rhel/9/${ARCH}/edge" OS_VARIANT="rhel9-unknown" diff --git a/test/cases/upgrade8to9.sh b/test/cases/upgrade8to9.sh index a68ee48dd..6dd3f28f2 100755 --- a/test/cases/upgrade8to9.sh +++ b/test/cases/upgrade8to9.sh @@ -71,8 +71,8 @@ ignoredisk --only-use=vda autopart --type=lvm clearpart --all --initlabel --drives=vda -repo --name baseos --baseurl="http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.7.0/compose/BaseOS/x86_64/os/" --install -repo --name appstream --baseurl="http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.7.0/compose/AppStream/x86_64/os/" --install +repo --name baseos --baseurl="http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.8.0/compose/BaseOS/x86_64/os/" --install +repo --name appstream --baseurl="http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.8.0/compose/AppStream/x86_64/os/" --install %packages @core @@ -103,7 +103,7 @@ sudo virt-install --name rhel-test \ --memory 3072 \ --vcpus 2 \ --disk size=20 \ - --location http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.7.0/compose/BaseOS/x86_64/os/ \ + --location http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.8.0/compose/BaseOS/x86_64/os/ \ --network network=integration,mac=34:49:22:B0:83:30 \ --console pipe,source.path="$TEMPFILE" \ --noautoconsole \ diff --git a/test/data/upgrade8to9/upgrade_prepare.sh b/test/data/upgrade8to9/upgrade_prepare.sh index aae59cd1b..052fd2207 100755 --- a/test/data/upgrade8to9/upgrade_prepare.sh +++ b/test/data/upgrade8to9/upgrade_prepare.sh @@ -22,13 +22,13 @@ get_data_files tee /etc/leapp/files/leapp_upgrade_repositories.repo > /dev/null << EOF [APPSTREAM] name=APPSTREAM -baseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.1.0/compose/AppStream/x86_64/os/ +baseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.2.0/compose/AppStream/x86_64/os/ enabled=0 gpgcheck=0 [BASEOS] name=BASEOS -baseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.1.0/compose/BaseOS/x86_64/os/ +baseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.2.0/compose/BaseOS/x86_64/os/ enabled=0 gpgcheck=0 EOF