Update virt tier2 tests for node to work on s390x

Signed-off-by: chandramerla <Chandra.Merla@ibm.com>

Author: chandramerla

tests/conftest.py

@@ -108,6 +108,7 @@
     RHEL9_STR,
     RHEL_WITH_INSTANCETYPE_AND_PREFERENCE,
     RHSM_SECRET_NAME,
+    S390X,
     SSP_CR_COMMON_TEMPLATES_LIST_KEY_NAME,
     TIMEOUT_3MIN,
     TIMEOUT_4MIN,
@@ -2770,7 +2771,13 @@ def cluster_modern_cpu_model_scope_class(
 @pytest.fixture(scope="module")
 def machine_type_from_kubevirt_config(kubevirt_config_scope_module, nodes_cpu_architecture):
     """Extract machine type default from kubevirt CR."""
-    return kubevirt_config_scope_module["architectureConfiguration"][nodes_cpu_architecture]["machineType"]
+    # Workaround for s390x (https://github.com/kubevirt/kubevirt/issues/14953), as machine type missing in config and
+    # hardcoded to s390_ccw_virtio in kubevirt code.
+    if nodes_cpu_architecture == S390X:
+        mc_type = "s390-ccw-virtio"
+    else:
+        mc_type = kubevirt_config_scope_module["architectureConfiguration"][nodes_cpu_architecture]["machineType"]
+    return mc_type
 
 
 @pytest.fixture(scope="module")

tests/utils.py

@@ -286,7 +286,7 @@ def update_cluster_cpu_model(admin_client, hco_namespace, hco_resource, cpu_mode
             hco_namespace=hco_namespace,
             path=["cpuModel"],
             value=cpu_model,
-            timeout=30,
+            timeout=60,
         )
         yield
 

tests/virt/constants.py

@@ -36,3 +36,7 @@ class MachineTypesNames:
     pc_q35_rhel7_4 = f"{pc_q35}-rhel7.4.0"
     pc_i440fx = "pc-i440fx"
     pc_i440fx_rhel7_6 = f"{pc_i440fx}-rhel7.6.0"
+    s390_ccw_virtio = "s390-ccw-virtio"
+    s390_ccw_virtio_rhel9_6 = f"{s390_ccw_virtio}-rhel9.6.0"
+    s390_ccw_virtio_rhel8_6 = f"{s390_ccw_virtio}-rhel8.6.0"
+    s390_ccw_virtio_rhel7_6 = f"{s390_ccw_virtio}-rhel7.6.0"

tests/virt/node/conftest.py

@@ -17,6 +17,7 @@
     FOUR_GI_MEMORY,
     ONE_CPU_CORE,
     ONE_CPU_THREAD,
+    S390X,
     TEN_GI_MEMORY,
 )
 from utilities.jira import is_jira_open
@@ -76,6 +77,7 @@ def hotplugged_vm(
     golden_image_data_source_scope_class,
     modern_cpu_for_migration,
     vmx_disabled_flag,
+    nodes_cpu_architecture,
 ):
     with VirtualMachineForTestsFromTemplate(
         name=request.param["vm_name"],
@@ -85,7 +87,8 @@ def hotplugged_vm(
         client=unprivileged_client,
         data_source=golden_image_data_source_scope_class,
         cpu_max_sockets=EIGHT_CPU_SOCKETS,
-        memory_max_guest=TEN_GI_MEMORY,
+        # s390x doesn't support maxGuest as it doesn't support hotplug
+        memory_max_guest=TEN_GI_MEMORY if nodes_cpu_architecture != S390X else None,
         cpu_sockets=FOUR_CPU_SOCKETS,
         cpu_threads=ONE_CPU_THREAD,
         cpu_cores=ONE_CPU_CORE,

tests/virt/node/cpu_sockets_threads/test_cpu_support_sockets_threads.py

@@ -45,22 +45,32 @@ def vm_with_cpu_support(request, namespace, unprivileged_client):
     [
         pytest.param(
             {"sockets": 2, "cores": 2, "threads": 2},
-            marks=(pytest.mark.polarion("CNV-2820"), pytest.mark.gating, pytest.mark.conformance),
+            marks=(pytest.mark.polarion("CNV-2820"), pytest.mark.gating, pytest.mark.conformance, pytest.mark.x86_64()),
             id="case1: 2 cores, 2 threads, 2 sockets",
         ),
         pytest.param(
             {"sockets": None, "cores": 1, "threads": 2},
-            marks=(pytest.mark.polarion("CNV-2823")),
+            marks=(pytest.mark.polarion("CNV-2823"), pytest.mark.x86_64()),
             id="case2: 1 cores, 2 threads, no sockets",
         ),
+        pytest.param(
+            {"sockets": 2, "cores": 2, "threads": 1},
+            marks=(pytest.mark.gating(), pytest.mark.s390x()),
+            id="case1: 2 cores, 1 threads, 2 sockets",
+        ),
+        pytest.param(
+            {"sockets": None, "cores": 1, "threads": 1},
+            marks=[pytest.mark.s390x()],
+            id="case2: 1 cores, 1 threads, no sockets",
+        ),
         pytest.param(
             {"sockets": 2, "cores": 1, "threads": None},
-            marks=(pytest.mark.polarion("CNV-2822")),
+            marks=(pytest.mark.polarion("CNV-2822"), pytest.mark.x86_64(), pytest.mark.s390x()),
             id="case3: 1 cores, no threads, 2 sockets",
         ),
         pytest.param(
             {"sockets": None, "cores": 2, "threads": None},
-            marks=(pytest.mark.polarion("CNV-2821")),
+            marks=(pytest.mark.polarion("CNV-2821"), pytest.mark.x86_64(), pytest.mark.s390x()),
             id="case4: 2 cores, no threads, no sockets",
         ),
     ],
@@ -97,6 +107,8 @@ def no_cpu_settings_vm(namespace, unprivileged_client):
 
 @pytest.mark.gating
 @pytest.mark.conformance
+@pytest.mark.x86_64
+@pytest.mark.s390x
 @pytest.mark.polarion("CNV-1485")
 def test_vm_with_no_cpu_settings(no_cpu_settings_vm):
     """
@@ -108,6 +120,8 @@ def test_vm_with_no_cpu_settings(no_cpu_settings_vm):
 
 
 @pytest.mark.gating
+@pytest.mark.x86_64
+@pytest.mark.s390x
 @pytest.mark.polarion("CNV-2818")
 def test_vm_with_cpu_limitation(namespace, unprivileged_client):
     """
@@ -130,6 +144,8 @@ def test_vm_with_cpu_limitation(namespace, unprivileged_client):
 
 
 @pytest.mark.polarion("CNV-2819")
+@pytest.mark.x86_64
+@pytest.mark.s390x
 def test_vm_with_cpu_limitation_negative(namespace, unprivileged_client):
     """
     Test VM with cpu limitation

tests/virt/node/efi_secureboot/test_vm_with_efi_secureboot.py

@@ -14,6 +14,7 @@
 
 @pytest.mark.gating
 @pytest.mark.polarion("CNV-4465")
+@pytest.mark.x86_64
 def test_efi_secureboot_with_smm_disabled(namespace, unprivileged_client):
     """Test that EFI secureBoot VM with SMM disabled, does not get created"""
     with pytest.raises(UnprocessibleEntityError):

tests/virt/node/general/test_custom_selinux_policy.py

@@ -3,6 +3,7 @@
 from utilities.infra import ExecCommandOnPod
 
 
+@pytest.mark.x86_64
 @pytest.mark.s390x
 @pytest.mark.polarion("CNV-9918")
 def test_customselinuxpolicy(workers_utility_pods, schedulable_nodes):
@@ -12,4 +13,4 @@ def test_customselinuxpolicy(workers_utility_pods, schedulable_nodes):
         out = pod_exec.exec(command="sudo semodule -l")
         if "virt_launcher" in out:
             nodes.append(node.name)
-    assert not nodes, f"node: {nodes} still have virt-launcher policies."
+    assert not nodes, f"node: {nodes} still have virt_launcher policies."

tests/virt/node/general/test_disable_pvspinlock.py

@@ -20,7 +20,8 @@ def vm_for_test_pvspinlock(
 
 
 @pytest.mark.polarion("CNV-6877")
-def test_disable_pvcpinlock(vm_for_test_pvspinlock):
+@pytest.mark.x86_64
+def test_disable_pvspinlock(vm_for_test_pvspinlock):
     assert vm_for_test_pvspinlock.privileged_vmi.xml_dict["domain"]["features"]["pvspinlock"]["@state"] == "off", (
         "pvspinlock is not disabled in domain xml."
     )

tests/virt/node/general/test_disk_io_option.py

@@ -67,6 +67,7 @@ def disk_options_vm(
 
 @pytest.mark.gating
 @pytest.mark.s390x
+@pytest.mark.x86_64
 @pytest.mark.parametrize(
     "golden_image_data_volume_scope_class,",
     [
@@ -115,6 +116,7 @@ def test_vm_with_disk_io_option_rhel(
 
 
 @pytest.mark.tier3
+@pytest.mark.x86_64
 @pytest.mark.parametrize(
     "golden_image_data_volume_scope_class,",
     [

tests/virt/node/general/test_legacy_machinetype.py

@@ -88,6 +88,7 @@ def rhel_8_10_vm(unprivileged_client, namespace, rhel_8_10_ds):
         )
     ],
 )
+@pytest.mark.x86_64  # no legacy machinetype for s390x which is different from emulated machine types
 def test_legacy_machine_type(
     updated_hco_emulated_machine_i440fx,
     rhel_8_10_vm,