[release-4.22] USHIFT-7337: Make RHEL optional scenarios consistent across OS versions and build types

test/scenarios-bootc/el10/periodics/el102-src@optional.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
+
 # Redefine network-related settings to use the dedicated network bridge
 VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
 # shellcheck disable=SC2034  # used elsewhere
@@ -15,7 +24,7 @@ scenario_create_vms() {
     fi
     LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source-optionals
     # Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface)
-    launch_vm rhel102-bootc --network "${networks}" --vm_disksize 25
+    launch_vm rhel102-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4
 }
 
 scenario_remove_vms() {

test/scenarios-bootc/el10/releases/el102-lrel@optional.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
+
 # Redefine network-related settings to use the dedicated network bridge
 VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
 # shellcheck disable=SC2034  # used elsewhere

test/scenarios-bootc/el9/releases/el98-lrel@optional.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
+
 # Redefine network-related settings to use the dedicated network bridge
 VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
 # shellcheck disable=SC2034  # used elsewhere
@@ -17,6 +26,7 @@ scenario_create_vms() {
     if [[ "${UNAME_M}" =~ aarch64 ]]; then
         networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}"
     fi
+
     LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
     # Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface)
     launch_vm rhel98-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4