ci/cli: increase CPU/MEM values for nodes

Increase values to:
- 4 vCPUs, 8GB of RAM for K3s
- 6 vCPUs, 10GB of RAM for RKE2

Signed-off-by: Loic Devulder <ldevulder@suse.com>

.github/workflows/master-e2e.yaml

@@ -410,11 +410,11 @@ jobs:
         run: |
           # Only use ISO boot if the upstream cluster is RKE2
           # due to issue with pxe, dhcp traffic
-          # Set RAM to 8GB for RKE2 and vCPU to 4, it's the recommended values
+          # Set RAM to 10GB for RKE2 and vCPU to 6, a bit more than the recommended values
           if ${{ contains(inputs.upstream_cluster_version, 'rke') }}; then
             export ISO_BOOT=true
-            export VM_MEM=8192
-            export VM_CPU=4
+            export VM_MEM=10240
+            export VM_CPU=6
           fi
           # Execute bootstrapping test
           if ${{ inputs.sequential == true }}; then
@@ -431,7 +431,13 @@ jobs:
         env:
           CLUSTER_NUMBER: ${{ inputs.cluster_number }}
           ISO_BOOT: ${{ inputs.iso_boot }}
-        run: cd tests && make e2e-multi-cluster
+        run: |
+          # Set RAM to 10GB for RKE2 and vCPU to 6, a bit more than the recommended values
+          if ${{ contains(inputs.upstream_cluster_version, 'rke') }}; then
+            export VM_MEM=10240
+            export VM_CPU=6
+          fi
+          cd tests && make e2e-multi-cluster
       - name: Install a simple application
         if: ${{ inputs.test_type == 'single_cli' && contains(inputs.upstream_cluster_version, 'k3s') }}
         run: cd tests && make e2e-install-app && make e2e-check-app
@@ -546,10 +552,10 @@ jobs:
           VM_START: 4
           VM_END: ${{ inputs.node_number }}
         run: |
-          # Set RAM to 8GB for RKE2 and vCPU to 4, it's the recommended values
+          # Set RAM to 10GB for RKE2 and vCPU to 6, a bit more than the recommended values
           if ${{ contains(inputs.upstream_cluster_version, 'rke') }}; then
-            export VM_MEM=8192
-            export VM_CPU=4
+            export VM_MEM=10240
+            export VM_CPU=6
           fi
           if ${{ inputs.sequential == true }}; then
             # Force node bootstrapping in sequential instead of parallel

tests/scripts/install-vm

@@ -26,10 +26,10 @@ if (( NR_HUGEPAGES == 0 && USE_HUGEPAGES != 0 )); then
     && sudo bash -c "echo ${VALUE} > /proc/sys/vm/nr_hugepages"
 
   # Set memory config on command line
-  INSTALL_FLAG+=" --memorybacking hugepages=yes,size=2,unit=M,locked=yes --memory ${VM_MEM:-2048},hugepages=yes"
+  INSTALL_FLAG+=" --memorybacking hugepages=yes,size=2,unit=M,locked=yes --memory ${VM_MEM:-4096},hugepages=yes"
 else
   # Set memory config on command line
-  INSTALL_FLAG+=" --memory ${VM_MEM:-2048}"
+  INSTALL_FLAG+=" --memory ${VM_MEM:-4096}"
 fi
 
 # Don't configure TPM if software emulation (EMULATE_TPM=true) is used
@@ -87,7 +87,7 @@ CMD="sudo virt-install \
        --machine q35 \
        --boot loader=${FW_CODE},loader.readonly=yes,loader.secure=yes,loader.type=pflash,nvram.template=${FW_VARS} \
        --features smm.state=yes \
-       --vcpus ${VM_CPU:-2} \
+       --vcpus ${VM_CPU:-4} \
        --cpu host \
        --disk path=${VM_NAME}/${VM_NAME}.img,bus=scsi,size=35 \
        --check disk_size=off \