NO-ISSUE: Reenable RHEL 9.8 and 10.2 leftover image builds and scenarios

test/image-blueprints-bootc/el10/layer2-presubmit/group2/rhel102-bootc-source-fips.containerfile.disabled → 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

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
+}

test/scenarios-bootc/el10/releases/el102-lrel@optional-sigstore.sh.disabled → 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() {

test/scenarios-bootc/el9/releases/el98-lrel@optional-sigstore.sh.disabled → 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() {

test/scenarios/releases/el98-zprel@el98-lrel@rpm-upgrade.sh.disabled → 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