diff --git a/test/bin/ci_phase_boot_and_test.sh b/test/bin/ci_phase_boot_and_test.sh index 2e2e1b23f0..f466de9fb6 100755 --- a/test/bin/ci_phase_boot_and_test.sh +++ b/test/bin/ci_phase_boot_and_test.sh @@ -10,7 +10,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "${SCRIPTDIR}/common.sh" # Directory to crawl for scenarios when creating/running in batch mode. # The CI system will override this depending on the job its running. -SCENARIO_SOURCES="${SCENARIO_SOURCES:-${TESTDIR}/scenarios}" +SCENARIO_SOURCES="${SCENARIO_SOURCES:-${TESTDIR}/scenarios-ostree}" # Directory where all the scenarios will be copied for execution, preserving # the original scenario type derived from its directory name. SCENARIOS_TO_RUN="${OUTPUTDIR}/scenarios-$(get_scenario_type_from_path "${SCENARIO_SOURCES}")" @@ -53,7 +53,10 @@ bash -x ./bin/manage_hypervisor_config.sh create # Setup a container registry and mirror images. # Release jobs need to also mirror the images from the brew RPMs. -if [[ "${SCENARIO_SOURCES:-}" =~ .*releases.* ]]; then +# RPM-only presubmits skip the mirror registry — scenarios pull images directly. +if [[ "${SCENARIO_SOURCES:-}" =~ .*scenarios-rpm.* ]]; then + export SKIP_MIRROR_REGISTRY=true +elif [[ "${SCENARIO_SOURCES:-}" =~ .*releases.* ]]; then bash -x ./bin/mirror_registry.sh -ri "${BREW_RPM_SOURCE}" else bash -x ./bin/mirror_registry.sh diff --git a/test/bin/ci_phase_iso_build.sh b/test/bin/ci_phase_iso_build.sh index 5cdbbe63f8..982e01ed2d 100755 --- a/test/bin/ci_phase_iso_build.sh +++ b/test/bin/ci_phase_iso_build.sh @@ -27,6 +27,9 @@ COMPOSER_CLI_BUILDS=true if [ -v CI_JOB_NAME ] && [[ "${CI_JOB_NAME}" =~ .*bootc.* ]]; then COMPOSER_CLI_BUILDS=false fi +if [ $# -gt 0 ] && [ "$1" = "-rpm_only" ]; then + COMPOSER_CLI_BUILDS=false +fi # Allow for a dry-run option to save on testing time BUILD_DRY_RUN=${BUILD_DRY_RUN:-false} @@ -36,6 +39,19 @@ dry_run() { # Try downloading the 'last' build cache. # Return 0 on success or 1 otherwise. +download_build_cache_isos() { + local -r cache_last="$(\ + ./bin/manage_build_cache.sh getlast \ + -b "${SCENARIO_BUILD_BRANCH}" -t "${SCENARIO_BUILD_TAG}" | \ + awk '/LAST:/ {print $NF}' \ + )" + if [[ -z "${cache_last}" ]]; then + echo "ERROR: Could not determine the 'last' build cache tag for branch '${SCENARIO_BUILD_BRANCH}'" + return 1 + fi + ./bin/manage_build_cache.sh download_isos -b "${SCENARIO_BUILD_BRANCH}" -t "${cache_last}" +} + download_build_cache() { local -r cache_last="$(\ ./bin/manage_build_cache.sh getlast \ @@ -215,6 +231,15 @@ if [ $# -gt 0 ] && [ "$1" = "-update_cache" ] ; then echo "ERROR: Access to the build cache is not available" exit 1 fi +elif [ $# -gt 0 ] && [ "$1" = "-rpm_only" ] ; then + mkdir -p "${VM_DISK_BASEDIR}" + if ${HAS_CACHE_ACCESS} ; then + download_build_cache_isos + else + echo "ERROR: RPM-only mode requires installer ISOs from the build cache, but cache access is not available" + exit 1 + fi + $(dry_run) bash -x ./bin/build_rpms.sh else GOT_CACHED_DATA=false if ${HAS_CACHE_ACCESS} ; then diff --git a/test/bin/common.sh b/test/bin/common.sh index 8b092354b8..cde2a34e74 100644 --- a/test/bin/common.sh +++ b/test/bin/common.sh @@ -265,7 +265,7 @@ get_scenario_type_from_path() { local type case "${1}" in - */scenarios/*|*/scenarios-ostree/*) + */scenarios-ostree/*) type="ostree" ;; */scenarios-bootc/*) @@ -274,6 +274,9 @@ get_scenario_type_from_path() { */scenarios-bootc-containers/*) type="bootc-containers" ;; + */scenarios-rpm/*) + type="rpm" + ;; *) type="unknown" ;; diff --git a/test/bin/manage_build_cache.sh b/test/bin/manage_build_cache.sh index edfa245310..c667a6a8e9 100755 --- a/test/bin/manage_build_cache.sh +++ b/test/bin/manage_build_cache.sh @@ -160,6 +160,22 @@ action_download() { done } +action_download_isos() { + local -r dst_base="${IMAGEDIR}" + local -r iso_dest="${dst_base}/${VM_POOL_BASENAME}" + + mkdir -p "${iso_dest}" + + local -r src_base="s3://${AWS_BUCKET_NAME}/${BCH_SUBDIR}/${ARCH_SUBDIR}/${TAG_SUBDIR}" + local -r iso_src="${src_base}/${VM_POOL_BASENAME}" + + echo "Downloading installer ISOs from '${iso_src}'" + run_aws_cli s3 sync --quiet --exclude '*' --include '*-installer.iso' "${iso_src}" "${iso_dest}" + + local -r iso_size="$(du -csh "${iso_dest}" | awk 'END{print $1}')" + echo "Downloaded ${iso_size} of installer ISOs" +} + action_verify() { if check_contents ; then echo OK @@ -304,7 +320,7 @@ fi # Run actions case "${action}" in - upload|download|verify|setlast|getlast|dellast|keep) + upload|download|download_isos|verify|setlast|getlast|dellast|keep) "action_${action}" "$@" ;; -h|help) diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh index 0303d542aa..41bb970076 100755 --- a/test/bin/scenario.sh +++ b/test/bin/scenario.sh @@ -1602,8 +1602,10 @@ check_dependencies() { "${TESTDIR}/bin/manage_webserver.sh" "start" fi - if ! sudo podman ps --format '{{.Names}}' | grep -q ^microshift-quay ; then - "${TESTDIR}/bin/mirror_registry.sh" + if [ "${SKIP_MIRROR_REGISTRY:-false}" != "true" ] ; then + if ! sudo podman ps --format '{{.Names}}' | grep -q ^microshift-quay ; then + "${TESTDIR}/bin/mirror_registry.sh" + fi fi } @@ -1672,6 +1674,35 @@ action_login() { fi } +action_setup() { + start_junit + trap "close_junit" EXIT + + if ! load_global_settings; then + record_junit "setup" "load_global_settings" "FAILED" + return 1 + fi + record_junit "setup" "load_global_settings" "OK" + + if ! load_scenario_script; then + record_junit "setup" "load_scenario_script" "FAILED" + return 1 + fi + record_junit "setup" "load_scenario_script" "OK" + + # shellcheck disable=SC2154 + trap 'rc=$? ; \ + [ "${rc}" -ne 0 ] && record_junit "setup" "scenario_setup_vms" "FAILED" ; \ + collect_pcp_reports || true ; \ + sos_report true || rc=1 ; \ + close_junit ; exit "${rc}"' EXIT + + if type scenario_setup_vms &>/dev/null; then + scenario_setup_vms + record_junit "setup" "scenario_setup_vms" "OK" + fi +} + action_run() { start_junit trap "close_junit" EXIT @@ -1754,7 +1785,7 @@ JUNIT_OUTPUT_FILE="${SCENARIO_INFO_DIR}/${SCENARIO}/phase_${action}/junit.xml" cd "${SCRIPTDIR}/.." case "${action}" in - create|run|cleanup|login) + create|setup|run|cleanup|login) "action_${action}" "$@" ;; boot) @@ -1767,10 +1798,12 @@ case "${action}" in rerun) action_cleanup "$@" action_create "$@" + action_setup "$@" action_run "$@" ;; create-and-run) action_create "$@" + action_setup "$@" action_run "$@" ;; *) diff --git a/test/bin/scenario_rpm.sh b/test/bin/scenario_rpm.sh new file mode 100644 index 0000000000..69e80f53a9 --- /dev/null +++ b/test/bin/scenario_rpm.sh @@ -0,0 +1,218 @@ +#!/bin/bash +# Common helper functions for RPM-install scenarios. +# Sourced by individual scenario scripts after scenario.sh sets up the environment. +# +# The RHEL version is derived from SCENARIO_TYPE (set by CI): +# rpm-presubmits-el9 -> RPM_RHEL_VERSION=9.8 +# rpm-presubmits-el10 -> RPM_RHEL_VERSION=10.2 +# For local testing, set RPM_RHEL_VERSION directly. + +export SKIP_GREENBOOT=true +export TEST_RANDOMIZATION=none + +# Derive RHEL version from SCENARIO_TYPE if not set explicitly. +# In CI, SCENARIO_TYPE is written to _output/scenario_type by the iso-build step. +if [[ -z "${RPM_RHEL_VERSION:-}" ]]; then + SCENARIO_TYPE="${SCENARIO_TYPE:-$(cat "${OUTPUTDIR}/scenario_type" 2>/dev/null || echo "")}" + case "${SCENARIO_TYPE}" in + *el10*) RPM_RHEL_VERSION="10.2" ;; + *el9*) RPM_RHEL_VERSION="9.8" ;; + *) + RPM_RHEL_VERSION="9.8" + echo "WARNING: Could not determine RHEL version from SCENARIO_TYPE='${SCENARIO_TYPE}', defaulting to ${RPM_RHEL_VERSION}" + ;; + esac +fi + +RPM_RHEL_MAJOR="${RPM_RHEL_VERSION%%.*}" +RPM_INSTALLER_IMAGE="rhel${RPM_RHEL_VERSION//./}-installer" +echo "RPM scenario targeting RHEL ${RPM_RHEL_VERSION} (installer: ${RPM_INSTALLER_IMAGE})" + +# Configure VM: firewall, RHSM registration, and RPM repos. +rpm_configure_vm() { + configure_vm_firewall host1 + subscription_manager_register host1 + configure_rpm_repos +} + +# Install MicroShift from the local RPM repo. +rpm_install_microshift() { + local -r reponame=$(basename "${LOCAL_REPO}") + local -r repo_url="${WEB_SERVER_URL}/rpm-repos/${reponame}" + local -r target_version=$(local_rpm_version) + + local -r tmp_file=$(mktemp) + tee "${tmp_file}" >/dev/null <&1) || true + echo "Post-install connectivity: ${nm_status}" + if [[ "${nm_status}" != *"full"* ]]; then + echo "WARNING: Network connectivity is '${nm_status}' after RPM install (expected 'full')" + fi + run_command_on_vm host1 "sudo systemctl start microshift.service" + + wait_for_microshift_endpoint /readyz + wait_for_microshift_endpoint /livez + echo "MicroShift is ready" +} + +configure_microshift_mirror() { + local -r repo=$1 + + if [[ -z "${repo}" ]] ; then + return + fi + if [[ ! "${repo}" =~ ^http ]]; then + return + fi + + local -r tmp_file=$(mktemp) + tee "${tmp_file}" >/dev/null </dev/null </dev/null </dev/null; then + break + fi + echo "Waiting for VM to come back (attempt ${attempt}/30)" + sleep 10 + done + wait_for_microshift_endpoint /readyz + wait_for_microshift_endpoint /livez + echo "MicroShift is ready after reboot" +} + +wait_for_microshift_endpoint() { + local -r endpoint=$1 + local -r kubeconfig="/var/lib/microshift/resources/kubeadmin/kubeconfig" + local attempt + for attempt in $(seq 30); do + if run_command_on_vm host1 "sudo /usr/bin/oc get --kubeconfig ${kubeconfig} --raw='${endpoint}' 2>/dev/null" | grep -q "ok"; then + return 0 + fi + echo "Waiting for MicroShift ${endpoint} (attempt ${attempt}/30)" + sleep 10 + done + echo "ERROR: MicroShift ${endpoint} did not become ready" + return 1 +} + diff --git a/test/scenarios-bootc/el10/periodics/el102-src@ai-model-serving-offline.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@ai-model-serving-offline.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@ai-model-serving-offline.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@ai-model-serving-offline.sh diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@ai-model-serving-online.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@ai-model-serving-online.sh similarity index 100% rename from test/scenarios-bootc/el10/presubmits/el102-src@ai-model-serving-online.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@ai-model-serving-online.sh diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@c2cc.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@c2cc.sh similarity index 100% rename from test/scenarios-bootc/el10/presubmits/el102-src@c2cc.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@c2cc.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@cncf-conformance.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@cncf-conformance.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@cncf-conformance.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@cncf-conformance.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@configuration1.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@configuration1.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@configuration1.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@configuration1.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@configuration2.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@configuration2.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@configuration2.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@configuration2.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@gitops-telemetry-clusterid-systemd.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@gitops-telemetry-clusterid-systemd.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@gitops-telemetry-clusterid-systemd.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@gitops-telemetry-clusterid-systemd.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@isolated-net.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@isolated-net.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@isolated-net.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@isolated-net.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@low-latency.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@low-latency.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@low-latency.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@low-latency.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@offline.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@offline.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@offline.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@offline.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@optional.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@optional.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@optional.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@optional.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@osconfig-cleanup-data.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@osconfig-cleanup-data.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@osconfig-cleanup-data.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@osconfig-cleanup-data.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@osconfig-lifecycle.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@osconfig-lifecycle-core-api.sh similarity index 94% rename from test/scenarios-bootc/el10/periodics/el102-src@osconfig-lifecycle.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@osconfig-lifecycle-core-api.sh index 369ddcd39f..2ad517f062 100644 --- a/test/scenarios-bootc/el10/periodics/el102-src@osconfig-lifecycle.sh +++ b/test/scenarios-bootc/el10/periodics-functional/el102-src@osconfig-lifecycle-core-api.sh @@ -14,6 +14,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ suites/osconfig/lifecycle.robot \ + suites/core-api/ \ suites/otp-workloads/oc-cli.robot \ suites/otp-workloads/statefulset-pvc.robot } diff --git a/test/scenarios-bootc/el10/periodics/el102-src@standard-suite1.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@standard-suite1.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@standard-suite1.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@standard-suite1.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@standard-suite2.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@standard-suite2.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@standard-suite2.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@standard-suite2.sh diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@storage.sh b/test/scenarios-bootc/el10/periodics-functional/el102-src@storage.sh similarity index 100% rename from test/scenarios-bootc/el10/presubmits/el102-src@storage.sh rename to test/scenarios-bootc/el10/periodics-functional/el102-src@storage.sh diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@auto-recovery.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el102-src@auto-recovery.sh similarity index 100% rename from test/scenarios-bootc/el10/presubmits/el102-src@auto-recovery.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el102-src@auto-recovery.sh diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@backup-and-restore-on-reboot.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el102-src@backup-and-restore-on-reboot.sh similarity index 100% rename from test/scenarios-bootc/el10/presubmits/el102-src@backup-and-restore-on-reboot.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el102-src@backup-and-restore-on-reboot.sh diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@backups.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el102-src@backups.sh similarity index 100% rename from test/scenarios-bootc/el10/presubmits/el102-src@backups.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el102-src@backups.sh diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@downgrade-block.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el102-src@downgrade-block.sh similarity index 100% rename from test/scenarios-bootc/el10/presubmits/el102-src@downgrade-block.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el102-src@downgrade-block.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@fault-tests-and-greenboot.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el102-src@fault-tests-and-greenboot.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@fault-tests-and-greenboot.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el102-src@fault-tests-and-greenboot.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@fips.sh.disabled b/test/scenarios-bootc/el10/periodics-lifecycle/el102-src@fips.sh.disabled similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@fips.sh.disabled rename to test/scenarios-bootc/el10/periodics-lifecycle/el102-src@fips.sh.disabled diff --git a/test/scenarios-bootc/el10/periodics/el102-src@upgrade-fails-cannot-backup.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el102-src@upgrade-fails-cannot-backup.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@upgrade-fails-cannot-backup.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el102-src@upgrade-fails-cannot-backup.sh diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@upgrade-fails.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el102-src@upgrade-fails.sh similarity index 100% rename from test/scenarios-bootc/el10/presubmits/el102-src@upgrade-fails.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el102-src@upgrade-fails.sh diff --git a/test/scenarios-bootc/el10/presubmits/el96-prel@el102-src@upgrade-ok.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el96-prel@el102-src@upgrade-ok.sh similarity index 100% rename from test/scenarios-bootc/el10/presubmits/el96-prel@el102-src@upgrade-ok.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el96-prel@el102-src@upgrade-ok.sh diff --git a/test/scenarios-bootc/el10/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh diff --git a/test/scenarios-bootc/el10/presubmits/el96-yminus2@el102-src@upgrade-ok.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el96-yminus2@el102-src@upgrade-ok.sh similarity index 100% rename from test/scenarios-bootc/el10/presubmits/el96-yminus2@el102-src@upgrade-ok.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el96-yminus2@el102-src@upgrade-ok.sh diff --git a/test/scenarios-bootc/el10/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh diff --git a/test/scenarios-bootc/el10/periodics/el98-src@el102-src@upgrade-ok.sh b/test/scenarios-bootc/el10/periodics-lifecycle/el98-src@el102-src@upgrade-ok.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el98-src@el102-src@upgrade-ok.sh rename to test/scenarios-bootc/el10/periodics-lifecycle/el98-src@el102-src@upgrade-ok.sh diff --git a/test/scenarios-bootc/el10/periodics/el102-src@osconfig-lifecycle-core-api.sh b/test/scenarios-bootc/el10/periodics/el102-src@osconfig-lifecycle-core-api.sh deleted file mode 100644 index 1f754f1573..0000000000 --- a/test/scenarios-bootc/el10/periodics/el102-src@osconfig-lifecycle-core-api.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-bootc.ks.template rhel102-bootc-source - launch_vm rhel102-bootc -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - suites/osconfig/lifecycle.robot \ - suites/core-api/ -} diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@dual-stack.sh b/test/scenarios-bootc/el10/presubmits/el102-src@dual-stack.sh deleted file mode 100644 index 2a710777d2..0000000000 --- a/test/scenarios-bootc/el10/presubmits/el102-src@dual-stack.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-bootc.ks.template rhel102-bootc-source - launch_vm rhel102-bootc --network "${VM_DUAL_STACK_NETWORK}" -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 suites/ipv6/dualstack.robot -} diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@ipv6.sh b/test/scenarios-bootc/el10/presubmits/el102-src@ipv6.sh deleted file mode 100644 index 95e3257480..0000000000 --- a/test/scenarios-bootc/el10/presubmits/el102-src@ipv6.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -# Redefine network-related settings to use the dedicated IPv6 network bridge -# shellcheck disable=SC2034 # used elsewhere -VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_IPV6_NETWORK}")" -# shellcheck disable=SC2034 # used elsewhere -WEB_SERVER_URL="http://[${VM_BRIDGE_IP}]:${WEB_SERVER_PORT}" -# Using `hostname` here instead of a raw ip because skopeo only allows either -# ipv4 or fqdn's, but not ipv6. Since the registry is hosted on the ipv6 -# network gateway in the host, we need to use a combination of the hostname -# plus /etc/hosts resolution (which is taken care of by kickstart). -# shellcheck disable=SC2034 # used elsewhere -MIRROR_REGISTRY_URL="$(hostname):${MIRROR_REGISTRY_PORT}/microshift" - -scenario_create_vms() { - # Enable IPv6 single stack in kickstart - prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source false true - launch_vm rhel102-bootc --network "${VM_IPV6_NETWORK}" -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 suites/ipv6/singlestack.robot -} diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@router.sh b/test/scenarios-bootc/el10/presubmits/el102-src@router.sh deleted file mode 100644 index 5185849f03..0000000000 --- a/test/scenarios-bootc/el10/presubmits/el102-src@router.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source - launch_vm rhel102-bootc -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - suites/router -} diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@rpm-install.sh b/test/scenarios-bootc/el10/presubmits/el102-src@rpm-install.sh deleted file mode 100644 index 6681535648..0000000000 --- a/test/scenarios-bootc/el10/presubmits/el102-src@rpm-install.sh +++ /dev/null @@ -1,157 +0,0 @@ -#!/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 </dev/null </dev/null </dev/null <