From 018fee4ef32a3a7ca808c5810472215225aad46d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Mon, 1 Sep 2025 13:32:48 +0200 Subject: [PATCH 01/24] add releases scenarios: RPM installation and ISO installation --- test/bin/scenario.sh | 7 +- ...96-bootc-brew-ec-with-optional.image-bootc | 3 + ...otc-brew-nightly-with-optional.image-bootc | 3 + ...96-bootc-brew-rc-with-optional.image-bootc | 3 + ...otc-brew-zstream-with-optional.image-bootc | 3 + ...l96-brew-ec-with-optionals.image-installer | 3 + ...rew-nightly-with-optionals.image-installer | 3 + ...l96-brew-rc-with-optionals.image-installer | 3 + ...rew-zstream-with-optionals.image-installer | 3 + .../releases/el96-lrel@standard1.sh | 2 +- .../releases/el96-lrel@standard2.sh | 2 +- .../scenarios/releases/el96-lrel@standard1.sh | 4 +- .../scenarios/releases/el96-lrel@standard2.sh | 4 +- test/scenarios/releases/el96@rpm-install.sh | 116 ++++++++++++++++++ 14 files changed, 150 insertions(+), 9 deletions(-) create mode 100644 test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-ec-with-optional.image-bootc create mode 100644 test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-nightly-with-optional.image-bootc create mode 100644 test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-rc-with-optional.image-bootc create mode 100644 test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-zstream-with-optional.image-bootc create mode 100644 test/image-blueprints/layer1-base/group4/rhel96-brew-ec-with-optionals.image-installer create mode 100644 test/image-blueprints/layer1-base/group4/rhel96-brew-nightly-with-optionals.image-installer create mode 100644 test/image-blueprints/layer1-base/group4/rhel96-brew-rc-with-optionals.image-installer create mode 100644 test/image-blueprints/layer1-base/group4/rhel96-brew-zstream-with-optionals.image-installer create mode 100644 test/scenarios/releases/el96@rpm-install.sh diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh index 7ad5b99782..4d5af1daf3 100755 --- a/test/bin/scenario.sh +++ b/test/bin/scenario.sh @@ -893,13 +893,14 @@ configure_vm_firewall() { # Function to report the full version of locally built RPMs, e.g. "4.17.0" local_rpm_version() { - if [ ! -d "${LOCAL_REPO}" ]; then + REPO="${$1:-LOCAL_REPO}" + if [ ! -d "${REPO}" ]; then "${TESTDIR}/bin/build_rpms.sh" fi - local -r release_info_rpm=$(find "${LOCAL_REPO}" -name 'microshift-release-info-*.rpm' | sort | tail -n 1) + local -r release_info_rpm=$(find "${REPO}" -name 'microshift-release-info-*.rpm' | sort | tail -n 1) if [ -z "${release_info_rpm}" ]; then - error "Failed to find microshift-release-info RPM in ${LOCAL_REPO}" + error "Failed to find microshift-release-info RPM in ${REPO}" exit 1 fi rpm -q --queryformat '%{version}-%{release}' "${release_info_rpm}" 2>/dev/null diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-ec-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-ec-with-optional.image-bootc new file mode 100644 index 0000000000..b40ceb3b68 --- /dev/null +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-ec-with-optional.image-bootc @@ -0,0 +1,3 @@ +{{- if env.Getenv "BREW_EC_RELEASE_VERSION" "" -}} +localhost/rhel96-bootc-brew-ec-with-optional:latest +{{- end }} diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-nightly-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-nightly-with-optional.image-bootc new file mode 100644 index 0000000000..266a2dffa5 --- /dev/null +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-nightly-with-optional.image-bootc @@ -0,0 +1,3 @@ +{{- if env.Getenv "BREW_NIGHTLY_RELEASE_VERSION" "" -}} +localhost/rhel96-bootc-brew-nightly-with-optional:latest +{{- end }} diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-rc-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-rc-with-optional.image-bootc new file mode 100644 index 0000000000..76cde0cba0 --- /dev/null +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-rc-with-optional.image-bootc @@ -0,0 +1,3 @@ +{{- if env.Getenv "BREW_RC_RELEASE_VERSION" "" -}} +localhost/rhel96-bootc-brew-rc-with-optional:latest +{{- end }} diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-zstream-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-zstream-with-optional.image-bootc new file mode 100644 index 0000000000..af993ec682 --- /dev/null +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-zstream-with-optional.image-bootc @@ -0,0 +1,3 @@ +{{- if env.Getenv "BREW_Y0_RELEASE_VERSION" "" -}} +localhost/rhel96-bootc-brew-zstream-with-optional:latest +{{- end }} diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-ec-with-optionals.image-installer b/test/image-blueprints/layer1-base/group4/rhel96-brew-ec-with-optionals.image-installer new file mode 100644 index 0000000000..3bd3c6e4ff --- /dev/null +++ b/test/image-blueprints/layer1-base/group4/rhel96-brew-ec-with-optionals.image-installer @@ -0,0 +1,3 @@ +{{- if env.Getenv "BREW_EC_RELEASE_VERSION" "" -}} +rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-ec +{{- end -}} diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-nightly-with-optionals.image-installer b/test/image-blueprints/layer1-base/group4/rhel96-brew-nightly-with-optionals.image-installer new file mode 100644 index 0000000000..063844268f --- /dev/null +++ b/test/image-blueprints/layer1-base/group4/rhel96-brew-nightly-with-optionals.image-installer @@ -0,0 +1,3 @@ +{{- if env.Getenv "BREW_NIGHTLY_RELEASE_VERSION" "" -}} +rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-nightly +{{- end -}} diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-rc-with-optionals.image-installer b/test/image-blueprints/layer1-base/group4/rhel96-brew-rc-with-optionals.image-installer new file mode 100644 index 0000000000..9b5c067c0c --- /dev/null +++ b/test/image-blueprints/layer1-base/group4/rhel96-brew-rc-with-optionals.image-installer @@ -0,0 +1,3 @@ +{{- if env.Getenv "BREW_RC_RELEASE_VERSION" "" -}} +rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-rc +{{- end -}} diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-zstream-with-optionals.image-installer b/test/image-blueprints/layer1-base/group4/rhel96-brew-zstream-with-optionals.image-installer new file mode 100644 index 0000000000..8f278b97e5 --- /dev/null +++ b/test/image-blueprints/layer1-base/group4/rhel96-brew-zstream-with-optionals.image-installer @@ -0,0 +1,3 @@ +{{- if env.Getenv "BREW_Y0_RELEASE_VERSION" "" -}} +rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION }}-zstream +{{- end -}} diff --git a/test/scenarios-bootc/releases/el96-lrel@standard1.sh b/test/scenarios-bootc/releases/el96-lrel@standard1.sh index 052faac7e1..191741b5f2 100644 --- a/test/scenarios-bootc/releases/el96-lrel@standard1.sh +++ b/test/scenarios-bootc/releases/el96-lrel@standard1.sh @@ -4,7 +4,7 @@ scenario_create_vms() { prepare_kickstart host1 kickstart-bootc.ks.template "rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional" - launch_vm --boot_blueprint rhel96-bootc + launch_vm --boot_blueprint "rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional" } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el96-lrel@standard2.sh b/test/scenarios-bootc/releases/el96-lrel@standard2.sh index 048165ad4d..fd86be7254 100644 --- a/test/scenarios-bootc/releases/el96-lrel@standard2.sh +++ b/test/scenarios-bootc/releases/el96-lrel@standard2.sh @@ -4,7 +4,7 @@ scenario_create_vms() { prepare_kickstart host1 kickstart-bootc.ks.template "rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional" - launch_vm --boot_blueprint rhel96-bootc + launch_vm --boot_blueprint "rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional" } scenario_remove_vms() { diff --git a/test/scenarios/releases/el96-lrel@standard1.sh b/test/scenarios/releases/el96-lrel@standard1.sh index cfd6cf0b3d..e2fe659b6c 100644 --- a/test/scenarios/releases/el96-lrel@standard1.sh +++ b/test/scenarios/releases/el96-lrel@standard1.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}" - launch_vm + prepare_kickstart host1 kickstart-liveimg.ks.template "" + launch_vm --boot_blueprint "rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}" } scenario_remove_vms() { diff --git a/test/scenarios/releases/el96-lrel@standard2.sh b/test/scenarios/releases/el96-lrel@standard2.sh index 84e892dca8..1738ce6645 100644 --- a/test/scenarios/releases/el96-lrel@standard2.sh +++ b/test/scenarios/releases/el96-lrel@standard2.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}" - launch_vm + prepare_kickstart host1 kickstart-liveimg.ks.template "" + launch_vm --boot_blueprint "rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}" } scenario_remove_vms() { diff --git a/test/scenarios/releases/el96@rpm-install.sh b/test/scenarios/releases/el96@rpm-install.sh new file mode 100644 index 0000000000..181d526a87 --- /dev/null +++ b/test/scenarios/releases/el96@rpm-install.sh @@ -0,0 +1,116 @@ +#!/bin/bash + +# Sourced from scenario.sh and uses functions defined there. + +# The RPM-based image used to create the VM for this test does not +# include MicroShift or greenboot, so tell the framework not to wait +# for greenboot to finish when creating the VM. +export SKIP_GREENBOOT=true + +# NOTE: Unlike most suites, these tests rely on being run IN ORDER to +# ensure the host is in a good state at the start of each test. We +# could have separated them and run them as separate scenarios, but +# did not want to spend the resources on a new VM. +export TEST_RANDOMIZATION=none + +configure_microshift_mirror() { + local -r repo=$1 + + # `repo` might be empty if we install microshift from rhocp + if [[ -z "${repo}" ]] ; then + return + fi + + # `repo` might be an enabled repo from a released version instead + # of a mirror. + if [[ ! "${repo}" =~ ^http ]]; then + return + fi + + local -r tmp_file=$(mktemp) + tee "${tmp_file}" >/dev/null </dev/null < Date: Mon, 1 Sep 2025 14:56:57 +0200 Subject: [PATCH 02/24] move image-installer and image-bootc files to a next layer --- .../layer1-base/{group2 => group3}/centos9-bootc.image-bootc | 0 .../layer1-base/{group2 => group3}/rhel94-bootc.image-bootc | 0 .../rhel96-bootc-brew-ec-with-optional.image-bootc | 0 .../rhel96-bootc-brew-nightly-with-optional.image-bootc | 0 .../rhel96-bootc-brew-rc-with-optional.image-bootc | 0 .../rhel96-bootc-brew-zstream-with-optional.image-bootc | 0 .../layer1-base/{group2 => group3}/rhel96-bootc.image-bootc | 0 .../layer1-base/{group4 => group5}/rhel94.image-installer | 0 .../rhel96-brew-ec-with-optionals.image-installer | 0 .../rhel96-brew-nightly-with-optionals.image-installer | 0 .../rhel96-brew-rc-with-optionals.image-installer | 0 .../rhel96-brew-zstream-with-optionals.image-installer | 0 .../rhel96-microshift-previous-minor.image-installer | 0 .../layer1-base/{group4 => group5}/rhel96.image-installer | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename test/image-blueprints-bootc/layer1-base/{group2 => group3}/centos9-bootc.image-bootc (100%) rename test/image-blueprints-bootc/layer1-base/{group2 => group3}/rhel94-bootc.image-bootc (100%) rename test/image-blueprints-bootc/layer1-base/{group2 => group3}/rhel96-bootc-brew-ec-with-optional.image-bootc (100%) rename test/image-blueprints-bootc/layer1-base/{group2 => group3}/rhel96-bootc-brew-nightly-with-optional.image-bootc (100%) rename test/image-blueprints-bootc/layer1-base/{group2 => group3}/rhel96-bootc-brew-rc-with-optional.image-bootc (100%) rename test/image-blueprints-bootc/layer1-base/{group2 => group3}/rhel96-bootc-brew-zstream-with-optional.image-bootc (100%) rename test/image-blueprints-bootc/layer1-base/{group2 => group3}/rhel96-bootc.image-bootc (100%) rename test/image-blueprints/layer1-base/{group4 => group5}/rhel94.image-installer (100%) rename test/image-blueprints/layer1-base/{group4 => group5}/rhel96-brew-ec-with-optionals.image-installer (100%) rename test/image-blueprints/layer1-base/{group4 => group5}/rhel96-brew-nightly-with-optionals.image-installer (100%) rename test/image-blueprints/layer1-base/{group4 => group5}/rhel96-brew-rc-with-optionals.image-installer (100%) rename test/image-blueprints/layer1-base/{group4 => group5}/rhel96-brew-zstream-with-optionals.image-installer (100%) rename test/image-blueprints/layer1-base/{group4 => group5}/rhel96-microshift-previous-minor.image-installer (100%) rename test/image-blueprints/layer1-base/{group4 => group5}/rhel96.image-installer (100%) diff --git a/test/image-blueprints-bootc/layer1-base/group2/centos9-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/centos9-bootc.image-bootc similarity index 100% rename from test/image-blueprints-bootc/layer1-base/group2/centos9-bootc.image-bootc rename to test/image-blueprints-bootc/layer1-base/group3/centos9-bootc.image-bootc diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel94-bootc.image-bootc similarity index 100% rename from test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc.image-bootc rename to test/image-blueprints-bootc/layer1-base/group3/rhel94-bootc.image-bootc diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-ec-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-ec-with-optional.image-bootc similarity index 100% rename from test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-ec-with-optional.image-bootc rename to test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-ec-with-optional.image-bootc diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-nightly-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-nightly-with-optional.image-bootc similarity index 100% rename from test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-nightly-with-optional.image-bootc rename to test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-nightly-with-optional.image-bootc diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-rc-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-rc-with-optional.image-bootc similarity index 100% rename from test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-rc-with-optional.image-bootc rename to test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-rc-with-optional.image-bootc diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-zstream-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-zstream-with-optional.image-bootc similarity index 100% rename from test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-zstream-with-optional.image-bootc rename to test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-zstream-with-optional.image-bootc diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc.image-bootc similarity index 100% rename from test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc rename to test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc.image-bootc diff --git a/test/image-blueprints/layer1-base/group4/rhel94.image-installer b/test/image-blueprints/layer1-base/group5/rhel94.image-installer similarity index 100% rename from test/image-blueprints/layer1-base/group4/rhel94.image-installer rename to test/image-blueprints/layer1-base/group5/rhel94.image-installer diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-ec-with-optionals.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals.image-installer similarity index 100% rename from test/image-blueprints/layer1-base/group4/rhel96-brew-ec-with-optionals.image-installer rename to test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals.image-installer diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-nightly-with-optionals.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-brew-nightly-with-optionals.image-installer similarity index 100% rename from test/image-blueprints/layer1-base/group4/rhel96-brew-nightly-with-optionals.image-installer rename to test/image-blueprints/layer1-base/group5/rhel96-brew-nightly-with-optionals.image-installer diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-rc-with-optionals.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-brew-rc-with-optionals.image-installer similarity index 100% rename from test/image-blueprints/layer1-base/group4/rhel96-brew-rc-with-optionals.image-installer rename to test/image-blueprints/layer1-base/group5/rhel96-brew-rc-with-optionals.image-installer diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-zstream-with-optionals.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-brew-zstream-with-optionals.image-installer similarity index 100% rename from test/image-blueprints/layer1-base/group4/rhel96-brew-zstream-with-optionals.image-installer rename to test/image-blueprints/layer1-base/group5/rhel96-brew-zstream-with-optionals.image-installer diff --git a/test/image-blueprints/layer1-base/group4/rhel96-microshift-previous-minor.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-microshift-previous-minor.image-installer similarity index 100% rename from test/image-blueprints/layer1-base/group4/rhel96-microshift-previous-minor.image-installer rename to test/image-blueprints/layer1-base/group5/rhel96-microshift-previous-minor.image-installer diff --git a/test/image-blueprints/layer1-base/group4/rhel96.image-installer b/test/image-blueprints/layer1-base/group5/rhel96.image-installer similarity index 100% rename from test/image-blueprints/layer1-base/group4/rhel96.image-installer rename to test/image-blueprints/layer1-base/group5/rhel96.image-installer From e6c6065da417261f02ae19fad3f9fe7a77772feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Tue, 2 Sep 2025 10:31:27 +0200 Subject: [PATCH 03/24] set temp s3 bucket for testing --- test/bin/manage_build_cache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bin/manage_build_cache.sh b/test/bin/manage_build_cache.sh index eeb88378ac..822ac804bd 100755 --- a/test/bin/manage_build_cache.sh +++ b/test/bin/manage_build_cache.sh @@ -7,7 +7,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # shellcheck source=test/bin/common.sh source "${SCRIPTDIR}/common.sh" -AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}" +AWS_BUCKET_NAME="microshift-ushift-6072-cache" BCH_SUBDIR= TAG_SUBDIR= From 7e90ac0abb6accdb733008ba48ed854434b46642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Tue, 2 Sep 2025 12:41:54 +0200 Subject: [PATCH 04/24] fix aws bucket name --- test/bin/manage_build_cache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bin/manage_build_cache.sh b/test/bin/manage_build_cache.sh index 822ac804bd..637b14052a 100755 --- a/test/bin/manage_build_cache.sh +++ b/test/bin/manage_build_cache.sh @@ -7,7 +7,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # shellcheck source=test/bin/common.sh source "${SCRIPTDIR}/common.sh" -AWS_BUCKET_NAME="microshift-ushift-6072-cache" +AWS_BUCKET_NAME="microshift-ushift-6072-cache-us-west-2" BCH_SUBDIR= TAG_SUBDIR= From 303dde9f6765e61284f29bc1a3f6f4fb70ff817a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Tue, 2 Sep 2025 14:15:25 +0200 Subject: [PATCH 05/24] remove no needed image-installer files --- .../group5/rhel96-brew-ec-with-optionals.image-installer | 3 --- .../group5/rhel96-brew-lrel-with-optionals.image-installer | 1 + .../group5/rhel96-brew-nightly-with-optionals.image-installer | 3 --- .../group5/rhel96-brew-rc-with-optionals.image-installer | 3 --- .../group5/rhel96-brew-zstream-with-optionals.image-installer | 3 --- 5 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals.image-installer create mode 100644 test/image-blueprints/layer1-base/group5/rhel96-brew-lrel-with-optionals.image-installer delete mode 100644 test/image-blueprints/layer1-base/group5/rhel96-brew-nightly-with-optionals.image-installer delete mode 100644 test/image-blueprints/layer1-base/group5/rhel96-brew-rc-with-optionals.image-installer delete mode 100644 test/image-blueprints/layer1-base/group5/rhel96-brew-zstream-with-optionals.image-installer diff --git a/test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals.image-installer deleted file mode 100644 index 3bd3c6e4ff..0000000000 --- a/test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals.image-installer +++ /dev/null @@ -1,3 +0,0 @@ -{{- if env.Getenv "BREW_EC_RELEASE_VERSION" "" -}} -rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-ec -{{- end -}} diff --git a/test/image-blueprints/layer1-base/group5/rhel96-brew-lrel-with-optionals.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-brew-lrel-with-optionals.image-installer new file mode 100644 index 0000000000..7c40cdc4d5 --- /dev/null +++ b/test/image-blueprints/layer1-base/group5/rhel96-brew-lrel-with-optionals.image-installer @@ -0,0 +1 @@ +rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-{{ .Env.LATEST_RELEASE_TYPE}} diff --git a/test/image-blueprints/layer1-base/group5/rhel96-brew-nightly-with-optionals.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-brew-nightly-with-optionals.image-installer deleted file mode 100644 index 063844268f..0000000000 --- a/test/image-blueprints/layer1-base/group5/rhel96-brew-nightly-with-optionals.image-installer +++ /dev/null @@ -1,3 +0,0 @@ -{{- if env.Getenv "BREW_NIGHTLY_RELEASE_VERSION" "" -}} -rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-nightly -{{- end -}} diff --git a/test/image-blueprints/layer1-base/group5/rhel96-brew-rc-with-optionals.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-brew-rc-with-optionals.image-installer deleted file mode 100644 index 9b5c067c0c..0000000000 --- a/test/image-blueprints/layer1-base/group5/rhel96-brew-rc-with-optionals.image-installer +++ /dev/null @@ -1,3 +0,0 @@ -{{- if env.Getenv "BREW_RC_RELEASE_VERSION" "" -}} -rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-rc -{{- end -}} diff --git a/test/image-blueprints/layer1-base/group5/rhel96-brew-zstream-with-optionals.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-brew-zstream-with-optionals.image-installer deleted file mode 100644 index 8f278b97e5..0000000000 --- a/test/image-blueprints/layer1-base/group5/rhel96-brew-zstream-with-optionals.image-installer +++ /dev/null @@ -1,3 +0,0 @@ -{{- if env.Getenv "BREW_Y0_RELEASE_VERSION" "" -}} -rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION }}-zstream -{{- end -}} From 1754d9e1bec3d75c04fe4a904a39d1b4ba9b013c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Wed, 3 Sep 2025 10:51:29 +0200 Subject: [PATCH 06/24] fix set default var --- test/bin/scenario.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh index 4d5af1daf3..77cf3666f3 100755 --- a/test/bin/scenario.sh +++ b/test/bin/scenario.sh @@ -893,7 +893,7 @@ configure_vm_firewall() { # Function to report the full version of locally built RPMs, e.g. "4.17.0" local_rpm_version() { - REPO="${$1:-LOCAL_REPO}" + REPO="${LOCAL_REPO:-$1}" if [ ! -d "${REPO}" ]; then "${TESTDIR}/bin/build_rpms.sh" fi From 02f3411393bbe7c1dd6fc43d6a6ba34321db946d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Wed, 3 Sep 2025 12:14:46 +0200 Subject: [PATCH 07/24] remove group 5 from ostree images --- .../layer1-base/{group5 => group4}/rhel94.image-installer | 0 .../rhel96-microshift-previous-minor.image-installer | 0 .../layer1-base/{group5 => group4}/rhel96.image-installer | 0 .../group5/rhel96-brew-lrel-with-optionals.image-installer | 1 - 4 files changed, 1 deletion(-) rename test/image-blueprints/layer1-base/{group5 => group4}/rhel94.image-installer (100%) rename test/image-blueprints/layer1-base/{group5 => group4}/rhel96-microshift-previous-minor.image-installer (100%) rename test/image-blueprints/layer1-base/{group5 => group4}/rhel96.image-installer (100%) delete mode 100644 test/image-blueprints/layer1-base/group5/rhel96-brew-lrel-with-optionals.image-installer diff --git a/test/image-blueprints/layer1-base/group5/rhel94.image-installer b/test/image-blueprints/layer1-base/group4/rhel94.image-installer similarity index 100% rename from test/image-blueprints/layer1-base/group5/rhel94.image-installer rename to test/image-blueprints/layer1-base/group4/rhel94.image-installer diff --git a/test/image-blueprints/layer1-base/group5/rhel96-microshift-previous-minor.image-installer b/test/image-blueprints/layer1-base/group4/rhel96-microshift-previous-minor.image-installer similarity index 100% rename from test/image-blueprints/layer1-base/group5/rhel96-microshift-previous-minor.image-installer rename to test/image-blueprints/layer1-base/group4/rhel96-microshift-previous-minor.image-installer diff --git a/test/image-blueprints/layer1-base/group5/rhel96.image-installer b/test/image-blueprints/layer1-base/group4/rhel96.image-installer similarity index 100% rename from test/image-blueprints/layer1-base/group5/rhel96.image-installer rename to test/image-blueprints/layer1-base/group4/rhel96.image-installer diff --git a/test/image-blueprints/layer1-base/group5/rhel96-brew-lrel-with-optionals.image-installer b/test/image-blueprints/layer1-base/group5/rhel96-brew-lrel-with-optionals.image-installer deleted file mode 100644 index 7c40cdc4d5..0000000000 --- a/test/image-blueprints/layer1-base/group5/rhel96-brew-lrel-with-optionals.image-installer +++ /dev/null @@ -1 +0,0 @@ -rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-{{ .Env.LATEST_RELEASE_TYPE}} From 9c14ef6e5c6c2e153255a437aee9ce3657d9155a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Wed, 3 Sep 2025 12:15:57 +0200 Subject: [PATCH 08/24] modify rpm scenarios to install from RPM and run standard suites --- .../presubmits/el96-src@rpm-install.sh | 2 +- .../scenarios/releases/el96-lrel@standard1.sh | 18 ---- .../scenarios/releases/el96-lrel@standard2.sh | 16 ---- ...install.sh => el96@rpm-install-upgrade.sh} | 0 test/scenarios/releases/el96@rpm-standard1.sh | 86 ++++++++++++++++++ test/scenarios/releases/el96@rpm-standard2.sh | 86 ++++++++++++++++++ test/suites/rpm/install.robot | 88 +++++++++++++++++++ ...cessful.robot => upgrade-successful.robot} | 13 --- 8 files changed, 261 insertions(+), 48 deletions(-) delete mode 100644 test/scenarios/releases/el96-lrel@standard1.sh delete mode 100644 test/scenarios/releases/el96-lrel@standard2.sh rename test/scenarios/releases/{el96@rpm-install.sh => el96@rpm-install-upgrade.sh} (100%) create mode 100644 test/scenarios/releases/el96@rpm-standard1.sh create mode 100644 test/scenarios/releases/el96@rpm-standard2.sh create mode 100644 test/suites/rpm/install.robot rename test/suites/rpm/{install-and-upgrade-successful.robot => upgrade-successful.robot} (90%) diff --git a/test/scenarios/presubmits/el96-src@rpm-install.sh b/test/scenarios/presubmits/el96-src@rpm-install.sh index 21576362a6..735df8ae95 100644 --- a/test/scenarios/presubmits/el96-src@rpm-install.sh +++ b/test/scenarios/presubmits/el96-src@rpm-install.sh @@ -112,5 +112,5 @@ scenario_run_tests() { --variable "SOURCE_REPO_URL:${source_repo_url}" \ --variable "TARGET_VERSION:${target_version}" \ --variable "PREVIOUS_MINOR_VERSION:${PREVIOUS_MINOR_VERSION}" \ - suites/rpm/install-and-upgrade-successful.robot + suites/rpm/install.robot suites/rpm/upgrade-successful.robot } diff --git a/test/scenarios/releases/el96-lrel@standard1.sh b/test/scenarios/releases/el96-lrel@standard1.sh deleted file mode 100644 index e2fe659b6c..0000000000 --- a/test/scenarios/releases/el96-lrel@standard1.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart-liveimg.ks.template "" - launch_vm --boot_blueprint "rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}" -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - --variable "EXPECTED_OS_VERSION:9.6" \ - suites/standard1/ suites/selinux/validate-selinux-policy.robot -} diff --git a/test/scenarios/releases/el96-lrel@standard2.sh b/test/scenarios/releases/el96-lrel@standard2.sh deleted file mode 100644 index 1738ce6645..0000000000 --- a/test/scenarios/releases/el96-lrel@standard2.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart-liveimg.ks.template "" - launch_vm --boot_blueprint "rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}" -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 suites/standard2/ -} diff --git a/test/scenarios/releases/el96@rpm-install.sh b/test/scenarios/releases/el96@rpm-install-upgrade.sh similarity index 100% rename from test/scenarios/releases/el96@rpm-install.sh rename to test/scenarios/releases/el96@rpm-install-upgrade.sh diff --git a/test/scenarios/releases/el96@rpm-standard1.sh b/test/scenarios/releases/el96@rpm-standard1.sh new file mode 100644 index 0000000000..e37a70683a --- /dev/null +++ b/test/scenarios/releases/el96@rpm-standard1.sh @@ -0,0 +1,86 @@ +#!/bin/bash + +# Sourced from scenario.sh and uses functions defined there. + +# The RPM-based image used to create the VM for this test does not +# include MicroShift or greenboot, so tell the framework not to wait +# for greenboot to finish when creating the VM. +export SKIP_GREENBOOT=true + +# NOTE: Unlike most suites, these tests rely on being run IN ORDER to +# ensure the host is in a good state at the start of each test. We +# could have separated them and run them as separate scenarios, but +# did not want to spend the resources on a new VM. +export TEST_RANDOMIZATION=none + +configure_rhocp_repo() { + local -r rhocp=$1 + local -r version=$2 + + # The repository may be empty if the beta mirror is not up yet + if [[ -z "${rhocp}" ]] ; then + return + fi + + if [[ "${rhocp}" =~ ^[0-9]{2} ]]; then + run_command_on_vm host1 "sudo subscription-manager repos --enable rhocp-4.${rhocp}-for-rhel-9-\$(uname -m)-rpms" + elif [[ "${rhocp}" =~ ^http ]]; then + local -r ocp_repo_name="rhocp-4.${version}-for-rhel-9-mirrorbeta-rpms" + local -r tmp_file=$(mktemp) + + tee "${tmp_file}" >/dev/null </dev/null < Date: Wed, 3 Sep 2025 15:42:12 +0200 Subject: [PATCH 09/24] set target version for rpm RF tests --- test/bin/scenario.sh | 8 ++++---- test/scenarios/releases/el96@rpm-standard1.sh | 3 +-- test/scenarios/releases/el96@rpm-standard2.sh | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh index 77cf3666f3..26b6783401 100755 --- a/test/bin/scenario.sh +++ b/test/bin/scenario.sh @@ -892,15 +892,15 @@ configure_vm_firewall() { } # Function to report the full version of locally built RPMs, e.g. "4.17.0" + local_rpm_version() { - REPO="${LOCAL_REPO:-$1}" - if [ ! -d "${REPO}" ]; then + if [ ! -d "${LOCAL_REPO}" ]; then "${TESTDIR}/bin/build_rpms.sh" fi - local -r release_info_rpm=$(find "${REPO}" -name 'microshift-release-info-*.rpm' | sort | tail -n 1) + local -r release_info_rpm=$(find "${LOCAL_REPO}" -name 'microshift-release-info-*.rpm' | sort | tail -n 1) if [ -z "${release_info_rpm}" ]; then - error "Failed to find microshift-release-info RPM in ${REPO}" + error "Failed to find microshift-release-info RPM in ${LOCAL_REPO}" exit 1 fi rpm -q --queryformat '%{version}-%{release}' "${release_info_rpm}" 2>/dev/null diff --git a/test/scenarios/releases/el96@rpm-standard1.sh b/test/scenarios/releases/el96@rpm-standard1.sh index e37a70683a..fe5ee043a0 100644 --- a/test/scenarios/releases/el96@rpm-standard1.sh +++ b/test/scenarios/releases/el96@rpm-standard1.sh @@ -65,7 +65,6 @@ scenario_remove_vms() { scenario_run_tests() { local -r reponame=$(basename "${BREW_REPO}") local -r repo_url="${WEB_SERVER_URL}/rpm-repos/${reponame}" - local -r target_version=$(local_rpm_version "${BREW_REPO}") # Enable the rhocp and dependency repositories. # @@ -79,7 +78,7 @@ scenario_run_tests() { run_tests host1 \ --exitonfailure \ --variable "SOURCE_REPO_URL:${repo_url}" \ - --variable "TARGET_VERSION:${target_version}" \ + --variable "TARGET_VERSION:${BREW_LREL_RELEASE_VERSION}" \ --variable "EXPECTED_OS_VERSION:9.6" \ suites/rpm/install.robot \ suites/standard1/ suites/selinux/validate-selinux-policy.robot diff --git a/test/scenarios/releases/el96@rpm-standard2.sh b/test/scenarios/releases/el96@rpm-standard2.sh index 8f9771db3e..b4f818a1f7 100644 --- a/test/scenarios/releases/el96@rpm-standard2.sh +++ b/test/scenarios/releases/el96@rpm-standard2.sh @@ -65,7 +65,6 @@ scenario_remove_vms() { scenario_run_tests() { local -r reponame=$(basename "${BREW_REPO}") local -r repo_url="${WEB_SERVER_URL}/rpm-repos/${reponame}" - local -r target_version=$(local_rpm_version "${BREW_REPO}") # Enable the rhocp and dependency repositories. # @@ -79,7 +78,7 @@ scenario_run_tests() { run_tests host1 \ --exitonfailure \ --variable "SOURCE_REPO_URL:${repo_url}" \ - --variable "TARGET_VERSION:${target_version}" \ + --variable "TARGET_VERSION:${BREW_LREL_RELEASE_VERSION}" \ --variable "EXPECTED_OS_VERSION:9.6" \ suites/rpm/install.robot \ suites/standard2/ From 83cc2659bd19b0041b4d48c6ca5a32f13befaeb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Wed, 3 Sep 2025 15:52:39 +0200 Subject: [PATCH 10/24] add BREW_LREL_RELEASE_VERSION var --- test/bin/common_versions.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/bin/common_versions.sh b/test/bin/common_versions.sh index 444875cc87..fc8aaaaee7 100644 --- a/test/bin/common_versions.sh +++ b/test/bin/common_versions.sh @@ -140,3 +140,6 @@ export BREW_NIGHTLY_RELEASE_VERSION # Set the release type to ec, rc or zstream LATEST_RELEASE_TYPE="ec" export LATEST_RELEASE_TYPE + +BREW_LREL_RELEASE_VERSION="${BREW_EC_RELEASE_VERSION}" +export BREW_LREL_RELEASE_VERSION From 5bfa62299d43ee0b27a02c896f6de54ed2524fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Wed, 3 Sep 2025 16:17:43 +0200 Subject: [PATCH 11/24] split install and remove microshift into 2 RF tests --- .../presubmits/el96-src@rpm-install.sh | 4 +- .../releases/el96@rpm-install-upgrade.sh | 4 +- test/suites/rpm/install.robot | 6 -- test/suites/rpm/remove.robot | 63 +++++++++++++++++++ 4 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 test/suites/rpm/remove.robot diff --git a/test/scenarios/presubmits/el96-src@rpm-install.sh b/test/scenarios/presubmits/el96-src@rpm-install.sh index 735df8ae95..8cc976a807 100644 --- a/test/scenarios/presubmits/el96-src@rpm-install.sh +++ b/test/scenarios/presubmits/el96-src@rpm-install.sh @@ -112,5 +112,7 @@ scenario_run_tests() { --variable "SOURCE_REPO_URL:${source_repo_url}" \ --variable "TARGET_VERSION:${target_version}" \ --variable "PREVIOUS_MINOR_VERSION:${PREVIOUS_MINOR_VERSION}" \ - suites/rpm/install.robot suites/rpm/upgrade-successful.robot + suites/rpm/install.robot \ + suites/rpm/remove.robot \ + suites/rpm/upgrade-successful.robot } diff --git a/test/scenarios/releases/el96@rpm-install-upgrade.sh b/test/scenarios/releases/el96@rpm-install-upgrade.sh index 181d526a87..e6d6c826dc 100644 --- a/test/scenarios/releases/el96@rpm-install-upgrade.sh +++ b/test/scenarios/releases/el96@rpm-install-upgrade.sh @@ -112,5 +112,7 @@ scenario_run_tests() { --variable "SOURCE_REPO_URL:${repo_url}" \ --variable "TARGET_VERSION:${target_version}" \ --variable "PREVIOUS_MINOR_VERSION:${PREVIOUS_MINOR_VERSION}" \ - suites/rpm/install-and-upgrade-successful.robot + suites/rpm/install.robot \ + suites/rpm/remove.robot \ + suites/rpm/upgrade-successful.robot } diff --git a/test/suites/rpm/install.robot b/test/suites/rpm/install.robot index c332bd942d..6bd501123a 100644 --- a/test/suites/rpm/install.robot +++ b/test/suites/rpm/install.robot @@ -43,7 +43,6 @@ Install Source Version Install MicroShift RPM Packages From Repo ${SOURCE_REPO_URL} ${TARGET_VERSION} Start MicroShift Wait For MicroShift - [Teardown] Clean Up Test *** Keywords *** @@ -77,11 +76,6 @@ Teardown [Documentation] Test suite teardown Logout MicroShift Host -Clean Up Test - [Documentation] Clean up an installed MicroShift instance - Cleanup MicroShift - Uninstall MicroShift RPM Packages - Install Third Party Packages With Warnings [Documentation] Install these separately to avoid having warnings ... show up in the warning check when installing MicroShift. diff --git a/test/suites/rpm/remove.robot b/test/suites/rpm/remove.robot new file mode 100644 index 0000000000..9b09feee3e --- /dev/null +++ b/test/suites/rpm/remove.robot @@ -0,0 +1,63 @@ +*** Comments *** +# NOTE: Unlike most suites, these tests rely on being run IN ORDER to +# ensure the host is in a good state at the start of each test. We +# could have separated them and run them as separate scenarios, but +# did not want to spend the resources on a new VM. +# +# The "Install Source Version" test wants to be run on a system where +# MicroShift has never been installed before to ensure that all of the +# dependencies are installed automatically. The test teardown step +# removes those RPMs, and then "Upgrade From Previous Version" +# installs the _older_ version of MicroShift and tries to upgrade it. + + +*** Settings *** +Documentation Tests related to installing MicroShift on a non-ostree system + +Resource ../../resources/common.resource +Resource ../../resources/microshift-rpm.resource +Resource ../../resources/microshift-process.resource +Library Collections +Library SSHLibrary + +Suite Setup Setup +Suite Teardown Teardown + +Test Tags restart rpm-based-system slow + + +*** Test Cases *** +Remove + [Documentation] Clean up an installed MicroShift instance + Cleanup MicroShift + Uninstall MicroShift RPM Packages + + +*** Keywords *** +Setup + [Documentation] Test suite setup + Check Required Env Variables + Login MicroShift Host + System Should Not Be Ostree + Pull Secret Should Be Installed + +Pull Secret Should Be Installed + [Documentation] Check that the kickstart file installed a pull secret for us + # Check that the file exists without actually saving the output so + # we don't have to clean the logs with the secret. + ${rc}= SSHLibrary.Execute Command + ... cat /etc/crio/openshift-pull-secret + ... sudo=True + ... return_rc=True + ... return_stdout=False + ... return_stderr=False + Should Be Equal As Integers 0 ${rc} + +System Should Not Be Ostree + [Documentation] Make sure we run on a non-ostree system + ${is_ostree}= Is System OSTree + Should Not Be True ${is_ostree} + +Teardown + [Documentation] Test suite teardown + Logout MicroShift Host From eee238b7d91f93a4eeb7e953da500ba588da8b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Wed, 3 Sep 2025 16:22:19 +0200 Subject: [PATCH 12/24] removed blank line --- test/bin/scenario.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh index 26b6783401..7ad5b99782 100755 --- a/test/bin/scenario.sh +++ b/test/bin/scenario.sh @@ -892,7 +892,6 @@ configure_vm_firewall() { } # Function to report the full version of locally built RPMs, e.g. "4.17.0" - local_rpm_version() { if [ ! -d "${LOCAL_REPO}" ]; then "${TESTDIR}/bin/build_rpms.sh" From a5b04b8295632fc930e0dc20ee948b323adfc5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Wed, 3 Sep 2025 18:04:36 +0200 Subject: [PATCH 13/24] install rhel 9.6 VM --- test/scenarios/releases/el96@rpm-standard1.sh | 3 +-- test/scenarios/releases/el96@rpm-standard2.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/scenarios/releases/el96@rpm-standard1.sh b/test/scenarios/releases/el96@rpm-standard1.sh index fe5ee043a0..eb7e86fdee 100644 --- a/test/scenarios/releases/el96@rpm-standard1.sh +++ b/test/scenarios/releases/el96@rpm-standard1.sh @@ -44,8 +44,7 @@ EOF scenario_create_vms() { prepare_kickstart host1 kickstart-liveimg.ks.template "" - launch_vm - + launch_vm --boot_blueprint rhel-9.6 # Open the firewall ports. Other scenarios get this behavior by # embedding settings in the blueprint, but there is no blueprint # for this scenario. We need do this step before running the RF diff --git a/test/scenarios/releases/el96@rpm-standard2.sh b/test/scenarios/releases/el96@rpm-standard2.sh index b4f818a1f7..7f4a3af16b 100644 --- a/test/scenarios/releases/el96@rpm-standard2.sh +++ b/test/scenarios/releases/el96@rpm-standard2.sh @@ -44,7 +44,7 @@ EOF scenario_create_vms() { prepare_kickstart host1 kickstart-liveimg.ks.template "" - launch_vm + launch_vm --boot_blueprint rhel-9.6 # Open the firewall ports. Other scenarios get this behavior by # embedding settings in the blueprint, but there is no blueprint From 7cbb16434f2daf2d10549f6888aa28e04fc6705f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Thu, 4 Sep 2025 10:56:26 +0200 Subject: [PATCH 14/24] set correct target version for rpm-install-upgrade test --- test/scenarios/releases/el96@rpm-install-upgrade.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/scenarios/releases/el96@rpm-install-upgrade.sh b/test/scenarios/releases/el96@rpm-install-upgrade.sh index e6d6c826dc..d9b8506c86 100644 --- a/test/scenarios/releases/el96@rpm-install-upgrade.sh +++ b/test/scenarios/releases/el96@rpm-install-upgrade.sh @@ -93,7 +93,6 @@ scenario_remove_vms() { scenario_run_tests() { local -r reponame=$(basename "${BREW_REPO}") local -r repo_url="${WEB_SERVER_URL}/rpm-repos/${reponame}" - local -r target_version=$(local_rpm_version "${BREW_REPO}") # Enable the rhocp and dependency repositories. # @@ -110,7 +109,7 @@ scenario_run_tests() { run_tests host1 \ --exitonfailure \ --variable "SOURCE_REPO_URL:${repo_url}" \ - --variable "TARGET_VERSION:${target_version}" \ + --variable "TARGET_VERSION:${BREW_LREL_RELEASE_VERSION}" \ --variable "PREVIOUS_MINOR_VERSION:${PREVIOUS_MINOR_VERSION}" \ suites/rpm/install.robot \ suites/rpm/remove.robot \ From 481eb0bd0c251d9cce056fd2aa42d5ef979ffd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Thu, 4 Sep 2025 13:47:41 +0200 Subject: [PATCH 15/24] OCPBUGS-60833: Fix router access logs container name --- assets/components/openshift-router/deployment.yaml | 2 +- .../011-ingress-deployment-access-logging.patch | 2 +- test/suites/router/router.robot | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/components/openshift-router/deployment.yaml b/assets/components/openshift-router/deployment.yaml index 4a7520c32e..af1f48f67f 100644 --- a/assets/components/openshift-router/deployment.yaml +++ b/assets/components/openshift-router/deployment.yaml @@ -219,7 +219,7 @@ spec: args: - -v=4 {{- if and .AccessLoggingEnabled (not .AccessLoggingSyslogAddress) }} - - name: access-logs + - name: logs imagePullPolicy: IfNotPresent terminationMessagePolicy: FallbackToLogsOnError image: '{{ .ReleaseImage.haproxy_router }}' diff --git a/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch b/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch index 8bb6df79c5..b9517e5751 100644 --- a/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch +++ b/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch @@ -78,7 +78,7 @@ index 916e4b601..9261e3700 100644 args: - -v=4 + {{- if and .AccessLoggingEnabled (not .AccessLoggingSyslogAddress) }} -+ - name: access-logs ++ - name: logs + imagePullPolicy: IfNotPresent + terminationMessagePolicy: FallbackToLogsOnError + image: '{{ .ReleaseImage.haproxy_router }}' diff --git a/test/suites/router/router.robot b/test/suites/router/router.robot index 6e62151f20..2d7553517d 100644 --- a/test/suites/router/router.robot +++ b/test/suites/router/router.robot @@ -431,5 +431,5 @@ Delete Custom CA Secret Check Access Logs [Documentation] Retrieve and check if a pattern appears in the router's access logs. [Arguments] ${pattern} - ${logs}= Oc Logs deployment/router-default -c access-logs openshift-ingress + ${logs}= Oc Logs deployment/router-default -c logs openshift-ingress Should Contain ${logs} ${pattern} From d19492b2f6032d8fc56c1d0106417711737a768c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Mon, 22 Sep 2025 12:03:21 +0200 Subject: [PATCH 16/24] remove no needed centos9 image --- .../layer1-base/group3/centos9-bootc.image-bootc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test/image-blueprints-bootc/layer1-base/group3/centos9-bootc.image-bootc diff --git a/test/image-blueprints-bootc/layer1-base/group3/centos9-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/centos9-bootc.image-bootc deleted file mode 100644 index 5099ec7dfc..0000000000 --- a/test/image-blueprints-bootc/layer1-base/group3/centos9-bootc.image-bootc +++ /dev/null @@ -1 +0,0 @@ -quay.io/centos-bootc/centos-bootc:stream9 \ No newline at end of file From 452078a4d5c19c370c47d3a609d6b9859eb09311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Mon, 22 Sep 2025 14:19:41 +0200 Subject: [PATCH 17/24] set nightly as last lrel for testing --- test/bin/common_versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bin/common_versions.sh b/test/bin/common_versions.sh index c5eb64bd9b..5f454f2322 100644 --- a/test/bin/common_versions.sh +++ b/test/bin/common_versions.sh @@ -141,7 +141,7 @@ export BREW_EC_RELEASE_VERSION export BREW_NIGHTLY_RELEASE_VERSION # Set the release type to ec, rc or zstream -LATEST_RELEASE_TYPE="ec" +LATEST_RELEASE_TYPE="nightly" export LATEST_RELEASE_TYPE BREW_LREL_RELEASE_VERSION="${BREW_EC_RELEASE_VERSION}" From 25d3a9577eb9b425fc57dd47218d567dcdecee8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Thu, 2 Oct 2025 11:20:20 +0000 Subject: [PATCH 18/24] fix lrel version --- test/bin/common_versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bin/common_versions.sh b/test/bin/common_versions.sh index 60441f6821..54405edee8 100644 --- a/test/bin/common_versions.sh +++ b/test/bin/common_versions.sh @@ -139,7 +139,7 @@ export BREW_RC_RELEASE_VERSION export BREW_EC_RELEASE_VERSION # Set the release type to ec, rc or zstream -LATEST_RELEASE_TYPE="nightly" +LATEST_RELEASE_TYPE="ec" export LATEST_RELEASE_TYPE BREW_LREL_RELEASE_VERSION="${BREW_EC_RELEASE_VERSION}" From ae9c700938eb6c951c5eb03f8cb319ddde8d51b8 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Thu, 2 Oct 2025 18:36:37 +0200 Subject: [PATCH 19/24] remove nightly bootc image --- .../group3/rhel96-bootc-brew-nightly-with-optional.image-bootc | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-nightly-with-optional.image-bootc diff --git a/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-nightly-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-nightly-with-optional.image-bootc deleted file mode 100644 index 266a2dffa5..0000000000 --- a/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-nightly-with-optional.image-bootc +++ /dev/null @@ -1,3 +0,0 @@ -{{- if env.Getenv "BREW_NIGHTLY_RELEASE_VERSION" "" -}} -localhost/rhel96-bootc-brew-nightly-with-optional:latest -{{- end }} From c5e947fa8c1e1c5b1bc5ad5f271cd159be108f9f Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Thu, 2 Oct 2025 23:17:47 +0200 Subject: [PATCH 20/24] revert temp AWS S3 bucket name --- test/bin/manage_build_cache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bin/manage_build_cache.sh b/test/bin/manage_build_cache.sh index 637b14052a..eeb88378ac 100755 --- a/test/bin/manage_build_cache.sh +++ b/test/bin/manage_build_cache.sh @@ -7,7 +7,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # shellcheck source=test/bin/common.sh source "${SCRIPTDIR}/common.sh" -AWS_BUCKET_NAME="microshift-ushift-6072-cache-us-west-2" +AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}" BCH_SUBDIR= TAG_SUBDIR= From 4603e0b1faa58634714f7c3e6cdc3a3e033d7b11 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Fri, 3 Oct 2025 09:16:11 +0200 Subject: [PATCH 21/24] remove duplicated function to common resource file --- test/resources/microshift-host.resource | 5 +++++ test/resources/microshift-rpm.resource | 8 ++++++++ test/suites/rpm/install.robot | 17 ----------------- test/suites/rpm/remove.robot | 18 +----------------- test/suites/rpm/upgrade-successful.robot | 17 ----------------- 5 files changed, 14 insertions(+), 51 deletions(-) diff --git a/test/resources/microshift-host.resource b/test/resources/microshift-host.resource index ed3986c405..a61b5fa3e4 100644 --- a/test/resources/microshift-host.resource +++ b/test/resources/microshift-host.resource @@ -99,6 +99,11 @@ Is System OSTree ... sudo=True return_stderr=False return_stdout=False return_rc=True IF ${rc} == 0 RETURN ${TRUE} ELSE RETURN ${FALSE} +System Should Not Be Ostree + [Documentation] Make sure we run on a non-ostree system + ${is_ostree}= Is System OSTree + Should Not Be True ${is_ostree} + System Should Be Rebooted [Documentation] Assert if the system rebooted comparing the current and provided boot identifier [Arguments] ${old_bootid} diff --git a/test/resources/microshift-rpm.resource b/test/resources/microshift-rpm.resource index 7f97d3f1b1..9ab8f146e2 100644 --- a/test/resources/microshift-rpm.resource +++ b/test/resources/microshift-rpm.resource @@ -107,3 +107,11 @@ Verify MicroShift RPM Install # Checks only config files from RPM packages excluding modification time check Command Should Work rpm -qa microshift\* | xargs -I {} bash -c 'echo {}; sudo rpm -V --configfiles --nomtime {}' + +Pull Secret Should Be Installed + [Documentation] Check that the kickstart file installed a pull secret for us + ${stdout} ${stderr} ${rc}= SSHLibrary.Execute Command + ... stat /etc/crio/openshift-pull-secret + ... sudo=True return_rc=True return_stderr=True return_stdout=True + Log Many ${stdout} ${stderr} + Should Be Equal As Integers 0 ${rc} \ No newline at end of file diff --git a/test/suites/rpm/install.robot b/test/suites/rpm/install.robot index 6bd501123a..8eb93793be 100644 --- a/test/suites/rpm/install.robot +++ b/test/suites/rpm/install.robot @@ -55,23 +55,6 @@ Setup System Should Not Be Ostree Pull Secret Should Be Installed -System Should Not Be Ostree - [Documentation] Make sure we run on a non-ostree system - ${is_ostree}= Is System OSTree - Should Not Be True ${is_ostree} - -Pull Secret Should Be Installed - [Documentation] Check that the kickstart file installed a pull secret for us - # Check that the file exists without actually saving the output so - # we don't have to clean the logs with the secret. - ${rc}= SSHLibrary.Execute Command - ... cat /etc/crio/openshift-pull-secret - ... sudo=True - ... return_rc=True - ... return_stdout=False - ... return_stderr=False - Should Be Equal As Integers 0 ${rc} - Teardown [Documentation] Test suite teardown Logout MicroShift Host diff --git a/test/suites/rpm/remove.robot b/test/suites/rpm/remove.robot index 9b09feee3e..d3eed6fcce 100644 --- a/test/suites/rpm/remove.robot +++ b/test/suites/rpm/remove.robot @@ -16,6 +16,7 @@ Documentation Tests related to installing MicroShift on a non-ostree syste Resource ../../resources/common.resource Resource ../../resources/microshift-rpm.resource +Resource ../../resources/microshift-host.resource Resource ../../resources/microshift-process.resource Library Collections Library SSHLibrary @@ -41,23 +42,6 @@ Setup System Should Not Be Ostree Pull Secret Should Be Installed -Pull Secret Should Be Installed - [Documentation] Check that the kickstart file installed a pull secret for us - # Check that the file exists without actually saving the output so - # we don't have to clean the logs with the secret. - ${rc}= SSHLibrary.Execute Command - ... cat /etc/crio/openshift-pull-secret - ... sudo=True - ... return_rc=True - ... return_stdout=False - ... return_stderr=False - Should Be Equal As Integers 0 ${rc} - -System Should Not Be Ostree - [Documentation] Make sure we run on a non-ostree system - ${is_ostree}= Is System OSTree - Should Not Be True ${is_ostree} - Teardown [Documentation] Test suite teardown Logout MicroShift Host diff --git a/test/suites/rpm/upgrade-successful.robot b/test/suites/rpm/upgrade-successful.robot index f856ecde31..a8b186a71f 100644 --- a/test/suites/rpm/upgrade-successful.robot +++ b/test/suites/rpm/upgrade-successful.robot @@ -85,23 +85,6 @@ Setup System Should Not Be Ostree Pull Secret Should Be Installed -System Should Not Be Ostree - [Documentation] Make sure we run on a non-ostree system - ${is_ostree}= Is System OSTree - Should Not Be True ${is_ostree} - -Pull Secret Should Be Installed - [Documentation] Check that the kickstart file installed a pull secret for us - # Check that the file exists without actually saving the output so - # we don't have to clean the logs with the secret. - ${rc}= SSHLibrary.Execute Command - ... cat /etc/crio/openshift-pull-secret - ... sudo=True - ... return_rc=True - ... return_stdout=False - ... return_stderr=False - Should Be Equal As Integers 0 ${rc} - Teardown [Documentation] Test suite teardown Logout MicroShift Host From 2296145ee8398cb72bb8bf022256de18b69a12c0 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Fri, 3 Oct 2025 11:02:28 +0200 Subject: [PATCH 22/24] add missing trailing blank line at the end of file --- test/resources/microshift-rpm.resource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/resources/microshift-rpm.resource b/test/resources/microshift-rpm.resource index 9ab8f146e2..3335a64ca4 100644 --- a/test/resources/microshift-rpm.resource +++ b/test/resources/microshift-rpm.resource @@ -114,4 +114,4 @@ Pull Secret Should Be Installed ... stat /etc/crio/openshift-pull-secret ... sudo=True return_rc=True return_stderr=True return_stdout=True Log Many ${stdout} ${stderr} - Should Be Equal As Integers 0 ${rc} \ No newline at end of file + Should Be Equal As Integers 0 ${rc} From 6b89620a789710fa0e43b0dbf17f5bfeaf651931 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Fri, 3 Oct 2025 14:43:53 +0200 Subject: [PATCH 23/24] remove not used image --- .../layer1-base/group3/rhel94-bootc.image-bootc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test/image-blueprints-bootc/layer1-base/group3/rhel94-bootc.image-bootc diff --git a/test/image-blueprints-bootc/layer1-base/group3/rhel94-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel94-bootc.image-bootc deleted file mode 100644 index 60c1f57ef5..0000000000 --- a/test/image-blueprints-bootc/layer1-base/group3/rhel94-bootc.image-bootc +++ /dev/null @@ -1 +0,0 @@ -registry.redhat.io/rhel9-eus/rhel-9.4-bootc:9.4 \ No newline at end of file From debf22bcb7f908df7c9f37e515efb32ccb02dae6 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Fri, 3 Oct 2025 14:48:21 +0200 Subject: [PATCH 24/24] remove check pull secret keyword from remove MicroShift test --- test/suites/rpm/remove.robot | 1 - 1 file changed, 1 deletion(-) diff --git a/test/suites/rpm/remove.robot b/test/suites/rpm/remove.robot index d3eed6fcce..a3d681f8fa 100644 --- a/test/suites/rpm/remove.robot +++ b/test/suites/rpm/remove.robot @@ -40,7 +40,6 @@ Setup Check Required Env Variables Login MicroShift Host System Should Not Be Ostree - Pull Secret Should Be Installed Teardown [Documentation] Test suite teardown