Adjust cpu for el9 presubmits

pacevedom · pacevedom · commit d779e570b714 · 2026-04-08T15:36:43.000+02:00
diff --git a/test/bin/vm_scheduler.sh b/test/bin/vm_scheduler.sh
@@ -148,10 +148,7 @@ init_scheduler() {
 }
 
 # Default VM resources when not specified in launch_vm
-# Using 4 vCPUs by default maximizes VM reuse potential:
-# - All VMs can run any scenario (no vcpu mismatch)
-# - More queuing = more reuse opportunities
-DEFAULT_VM_VCPUS=4
+DEFAULT_VM_VCPUS=2
 DEFAULT_VM_MEMORY=4096
 
 parse_static_scenario_resources() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@auto-recovery-extra.sh b/test/scenarios-bootc/el9/presubmits/el98-src@auto-recovery-extra.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -17,7 +17,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@auto-recovery.sh b/test/scenarios-bootc/el9/presubmits/el98-src@auto-recovery.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -17,7 +17,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@backup-and-restore-on-reboot.sh b/test/scenarios-bootc/el9/presubmits/el98-src@backup-and-restore-on-reboot.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -17,7 +17,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@backups.sh b/test/scenarios-bootc/el9/presubmits/el98-src@backups.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -17,7 +17,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@configuration.sh b/test/scenarios-bootc/el9/presubmits/el98-src@configuration.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -17,7 +17,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@containers-policy.sh b/test/scenarios-bootc/el9/presubmits/el98-src@containers-policy.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -17,7 +17,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@dns.sh b/test/scenarios-bootc/el9/presubmits/el98-src@dns.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=default
@@ -16,7 +16,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@dual-stack.sh b/test/scenarios-bootc/el9/presubmits/el98-src@dual-stack.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks="${VM_DUAL_STACK_NETWORK}"
@@ -16,7 +16,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc --network "${VM_DUAL_STACK_NETWORK}"
+    launch_vm rhel98-bootc --vm_vcpus 4 --network "${VM_DUAL_STACK_NETWORK}"
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@etcd.sh b/test/scenarios-bootc/el9/presubmits/el98-src@etcd.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=default
@@ -16,7 +16,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@feature-gates.sh b/test/scenarios-bootc/el9/presubmits/el98-src@feature-gates.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -16,7 +16,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@hostname.sh b/test/scenarios-bootc/el9/presubmits/el98-src@hostname.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -16,7 +16,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@ipv6.sh b/test/scenarios-bootc/el9/presubmits/el98-src@ipv6.sh
@@ -17,7 +17,7 @@ MIRROR_REGISTRY_URL="$(hostname):${MIRROR_REGISTRY_PORT}/microshift"
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks="${VM_IPV6_NETWORK}"
@@ -30,7 +30,7 @@ EOF
 scenario_create_vms() {
     # Enable IPv6 single stack in kickstart
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source false true
-    launch_vm rhel98-bootc --network "${VM_IPV6_NETWORK}"
+    launch_vm rhel98-bootc --vm_vcpus 4 --network "${VM_IPV6_NETWORK}"
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@kustomize.sh b/test/scenarios-bootc/el9/presubmits/el98-src@kustomize.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -16,7 +16,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@log-scan.sh b/test/scenarios-bootc/el9/presubmits/el98-src@log-scan.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -16,7 +16,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@multi-nic.sh b/test/scenarios-bootc/el9/presubmits/el98-src@multi-nic.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=default,"${VM_MULTUS_NETWORK}"
@@ -18,7 +18,7 @@ EOF
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
     # Using multus as secondary network to have 2 nics in different networks.
-    launch_vm rhel98-bootc --network default,"${VM_MULTUS_NETWORK}"
+    launch_vm rhel98-bootc --vm_vcpus 4 --network default,"${VM_MULTUS_NETWORK}"
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@multus.sh b/test/scenarios-bootc/el9/presubmits/el98-src@multus.sh
@@ -20,7 +20,7 @@ fi
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=multus
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@networking-smoke.sh b/test/scenarios-bootc/el9/presubmits/el98-src@networking-smoke.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -16,7 +16,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@pvc-resize.sh b/test/scenarios-bootc/el9/presubmits/el98-src@pvc-resize.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -17,7 +17,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@reboot.sh b/test/scenarios-bootc/el9/presubmits/el98-src@reboot.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -16,7 +16,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@router.sh b/test/scenarios-bootc/el9/presubmits/el98-src@router.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -17,7 +17,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@show-config.sh b/test/scenarios-bootc/el9/presubmits/el98-src@show-config.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -17,7 +17,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@snapshot.sh b/test/scenarios-bootc/el9/presubmits/el98-src@snapshot.sh
@@ -5,7 +5,7 @@
 # Opt-in to dynamic VM scheduling by declaring requirements
 dynamic_schedule_requirements() {
     cat <<EOF
-min_vcpus=2
+min_vcpus=4
 min_memory=4096
 min_disksize=20
 networks=
@@ -16,7 +16,7 @@ EOF
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
-    launch_vm rhel98-bootc
+    launch_vm rhel98-bootc --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@storage-version-migration.sh b/test/scenarios-bootc/el9/presubmits/el98-src@storage-version-migration.sh
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@storage.sh b/test/scenarios-bootc/el9/presubmits/el98-src@storage.sh
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@tls-configuration.sh b/test/scenarios-bootc/el9/presubmits/el98-src@tls-configuration.sh
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@validate-certificate-rotation.sh b/test/scenarios-bootc/el9/presubmits/el98-src@validate-certificate-rotation.sh
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@validate-custom-certificates.sh b/test/scenarios-bootc/el9/presubmits/el98-src@validate-custom-certificates.sh
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@validate-selinux-policy.sh b/test/scenarios-bootc/el9/presubmits/el98-src@validate-selinux-policy.sh
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@validate-service-account-ca-bundle.sh b/test/scenarios-bootc/el9/presubmits/el98-src@validate-service-account-ca-bundle.sh
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@version.sh b/test/scenarios-bootc/el9/presubmits/el98-src@version.sh
