diff --git a/test/image-blueprints-bootc/el10/layer2-presubmit/group2/rhel102-bootc-source-fips.containerfile.disabled b/test/image-blueprints-bootc/el10/layer2-presubmit/group2/rhel102-bootc-source-fips.containerfile similarity index 62% rename from test/image-blueprints-bootc/el10/layer2-presubmit/group2/rhel102-bootc-source-fips.containerfile.disabled rename to test/image-blueprints-bootc/el10/layer2-presubmit/group2/rhel102-bootc-source-fips.containerfile index 28a88aec10..ae6f69cc9e 100644 --- a/test/image-blueprints-bootc/el10/layer2-presubmit/group2/rhel102-bootc-source-fips.containerfile.disabled +++ b/test/image-blueprints-bootc/el10/layer2-presubmit/group2/rhel102-bootc-source-fips.containerfile @@ -8,9 +8,6 @@ match-architectures = ["x86_64"] EOF # Enable the FIPS crypto policy -# -# Note: CNI plugins are required for podman to operate normally on RHEL 9.x. -# This package is no longer installed as cri-o dependency. -RUN dnf install -y crypto-policies-scripts containernetworking-plugins && \ +RUN dnf install -y crypto-policies-scripts && \ update-crypto-policies --no-reload --set FIPS && \ dnf clean all diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel98-source-tuned.toml.disabled b/test/image-blueprints/layer2-presubmit/group1/rhel98-source-tuned.toml similarity index 100% rename from test/image-blueprints/layer2-presubmit/group1/rhel98-source-tuned.toml.disabled rename to test/image-blueprints/layer2-presubmit/group1/rhel98-source-tuned.toml diff --git a/test/scenarios-bootc/el10/periodics/el102-src@fips.sh.disabled b/test/scenarios-bootc/el10/periodics/el102-src@fips.sh similarity index 100% rename from test/scenarios-bootc/el10/periodics/el102-src@fips.sh.disabled rename to test/scenarios-bootc/el10/periodics/el102-src@fips.sh diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@upgrade-fails-then-recovers.sh b/test/scenarios-bootc/el10/presubmits/el102-src@upgrade-fails-then-recovers.sh new file mode 100644 index 0000000000..c8d80fb6ff --- /dev/null +++ b/test/scenarios-bootc/el10/presubmits/el102-src@upgrade-fails-then-recovers.sh @@ -0,0 +1,19 @@ +#!/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 \ + --variable "TARGET_REF:rhel102-bootc-source-fake-next-minor" \ + --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ + suites/upgrade/upgrade-fails-then-recovers.robot +} diff --git a/test/scenarios-bootc/el10/releases/el102-lrel@optional-sigstore.sh.disabled b/test/scenarios-bootc/el10/releases/el102-lrel@optional-sigstore.sh similarity index 69% rename from test/scenarios-bootc/el10/releases/el102-lrel@optional-sigstore.sh.disabled rename to test/scenarios-bootc/el10/releases/el102-lrel@optional-sigstore.sh index c8884d067b..e657720bb7 100644 --- a/test/scenarios-bootc/el10/releases/el102-lrel@optional-sigstore.sh.disabled +++ b/test/scenarios-bootc/el10/releases/el102-lrel@optional-sigstore.sh @@ -2,6 +2,15 @@ # Sourced from scenario.sh and uses functions defined there. +# Each optional suite restarts MicroShift with its own kustomizePaths config, +# adding ~10 minutes of restart overhead to the total execution time. +# shellcheck disable=SC2034 # used elsewhere +TEST_EXECUTION_TIMEOUT=60m + +# shellcheck disable=SC2034 # used elsewhere +# Increase greenboot timeout for optional packages (more services to start) +GREENBOOT_TIMEOUT=1200 + # Enable container signature verification for current release images, # including the optional components. # These are ec / rc / z-stream, thus must all to be signed. @@ -14,7 +23,7 @@ scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel102-bootc + launch_vm rhel102-bootc --vm_disksize 25 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@upgrade-fails-then-recovers.sh.disabled b/test/scenarios-bootc/el9/presubmits/el98-src@upgrade-fails-then-recovers.sh similarity index 100% rename from test/scenarios-bootc/el9/presubmits/el98-src@upgrade-fails-then-recovers.sh.disabled rename to test/scenarios-bootc/el9/presubmits/el98-src@upgrade-fails-then-recovers.sh diff --git a/test/scenarios-bootc/el9/releases/el98-lrel@optional-sigstore.sh.disabled b/test/scenarios-bootc/el9/releases/el98-lrel@optional-sigstore.sh similarity index 69% rename from test/scenarios-bootc/el9/releases/el98-lrel@optional-sigstore.sh.disabled rename to test/scenarios-bootc/el9/releases/el98-lrel@optional-sigstore.sh index 1d9d95ef94..fc078e23c9 100644 --- a/test/scenarios-bootc/el9/releases/el98-lrel@optional-sigstore.sh.disabled +++ b/test/scenarios-bootc/el9/releases/el98-lrel@optional-sigstore.sh @@ -2,6 +2,15 @@ # Sourced from scenario.sh and uses functions defined there. +# Each optional suite restarts MicroShift with its own kustomizePaths config, +# adding ~10 minutes of restart overhead to the total execution time. +# shellcheck disable=SC2034 # used elsewhere +TEST_EXECUTION_TIMEOUT=60m + +# shellcheck disable=SC2034 # used elsewhere +# Increase greenboot timeout for optional packages (more services to start) +GREENBOOT_TIMEOUT=1200 + # Enable container signature verification for current release images, # including the optional components. # These are ec / rc / z-stream, thus must all to be signed. @@ -14,7 +23,7 @@ scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel98-bootc + launch_vm rhel98-bootc --vm_disksize 25 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios/presubmits/el98-src@low-latency.sh.disabled b/test/scenarios/presubmits/el98-src@low-latency.sh similarity index 100% rename from test/scenarios/presubmits/el98-src@low-latency.sh.disabled rename to test/scenarios/presubmits/el98-src@low-latency.sh diff --git a/test/scenarios/presubmits/el98-src@upgrade-fails-then-recovers.sh.disabled b/test/scenarios/presubmits/el98-src@upgrade-fails-then-recovers.sh similarity index 100% rename from test/scenarios/presubmits/el98-src@upgrade-fails-then-recovers.sh.disabled rename to test/scenarios/presubmits/el98-src@upgrade-fails-then-recovers.sh diff --git a/test/scenarios/releases/el98-lrel@low-latency.sh.disabled b/test/scenarios/releases/el98-lrel@low-latency.sh similarity index 100% rename from test/scenarios/releases/el98-lrel@low-latency.sh.disabled rename to test/scenarios/releases/el98-lrel@low-latency.sh diff --git a/test/scenarios/releases/el98-zprel@el98-lrel@rpm-upgrade.sh.disabled b/test/scenarios/releases/el98-zprel@el98-lrel@rpm-upgrade.sh similarity index 98% rename from test/scenarios/releases/el98-zprel@el98-lrel@rpm-upgrade.sh.disabled rename to test/scenarios/releases/el98-zprel@el98-lrel@rpm-upgrade.sh index 535d0c92a4..c052bd32ee 100644 --- a/test/scenarios/releases/el98-zprel@el98-lrel@rpm-upgrade.sh.disabled +++ b/test/scenarios/releases/el98-zprel@el98-lrel@rpm-upgrade.sh @@ -18,7 +18,7 @@ scenario_create_vms() { exit_if_brew_rpms_not_found prepare_kickstart host1 kickstart-liveimg.ks.template "" - launch_vm --boot_blueprint rhel-9.8 + launch_vm rhel-9.8 # 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