Update test_data_collected_from_virt_launcher[test_domcapabilities] for s390x

1. As ovmfpath is empty for s390x, changed to machine_type field instead

2. As architectureConfiguration for s390x is fixed in kubevirt 1.7, temporarily added the defaults in the test

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

Author: chandramerla

tests/install_upgrade_operators/must_gather/test_must_gather_vms.py

@@ -31,7 +31,8 @@
     validate_no_empty_files_collected_must_gather_vm,
 )
 from tests.os_params import FEDORA_LATEST
-from utilities.constants import ARM_64, COUNT_FIVE
+from utilities.constants import ARM_64, COUNT_FIVE, S390X
+from utilities.infra import is_jira_open
 
 pytestmark = [pytest.mark.post_upgrade, pytest.mark.skip_must_gather_collection, pytest.mark.arm64, pytest.mark.s390x]
 
@@ -43,15 +44,24 @@ def kubevirt_architecture_configuration_scope_session(
     kubevirt_resource_scope_session,
     nodes_cpu_architecture,
 ):
-    kubevirt_architecture_config = kubevirt_resource_scope_session.instance.to_dict()["spec"]["configuration"][
-        "architectureConfiguration"
-    ][nodes_cpu_architecture]
+    kubevirt_architecture_config = {}
 
-    # Default value of kubevirt.spec.configuration.architectureConfiguration.arm64.ovmfPath is
-    # '/usr/share/AAVMF' but the files in this location are symlinked to
-    # '/usr/share/edk2/aarch64'. VM domain capabilities refer to symlinked file.
-    if nodes_cpu_architecture == ARM_64:
-        kubevirt_architecture_config["ovmfPath"] = "/usr/share/edk2/aarch64"
+    # TODO: This block for s390x to be removed once we move to kubevirt version 1.7 as this is
+    # fixed in https://github.com/kubevirt/kubevirt/issues/14953
+    if nodes_cpu_architecture == S390X and is_jira_open(jira_id="CNV-70161"):
+        kubevirt_architecture_config["ovmfPath"] = ""
+        kubevirt_architecture_config["machineType"] = "s390-ccw-virtio"
+        kubevirt_architecture_config["emulatedMachines"] = "s390-ccw-virtio*"
+    else:
+        kubevirt_architecture_config = kubevirt_resource_scope_session.instance.to_dict()["spec"]["configuration"][
+            "architectureConfiguration"
+        ][nodes_cpu_architecture]
+
+        # Default value of kubevirt.spec.configuration.architectureConfiguration.arm64.ovmfPath is
+        # '/usr/share/AAVMF' but the files in this location are symlinked to
+        # '/usr/share/edk2/aarch64'. VM domain capabilities refer to symlinked file.
+        if nodes_cpu_architecture == ARM_64:
+            kubevirt_architecture_config["ovmfPath"] = "/usr/share/edk2/aarch64"
     return kubevirt_architecture_config
 
 
@@ -170,7 +180,7 @@ class TestMustGatherVmDetails:
             ),
             pytest.param(
                 {FILE_SUFFIX: DOMCAPABILITIES_XML, SECTION_TITLE: None},
-                "<value>{ovmfpath}",
+                "<path>/usr/libexec/qemu-kvm</path>",
                 marks=(pytest.mark.polarion("CNV-10519")),
                 id="test_domcapabilities",
             ),