RedHatQE · rnetser · May 17, 2025 · May 17, 2025 · May 17, 2025 · May 17, 2025
diff --git a/README.md b/README.md
@@ -89,6 +89,8 @@ nameserver 192.168.8.1
 The tests can dynamically select test images based on the system's architecture. This is controlled by the environment variable `OPENSHIFT_VIRTUALIZATION_TEST_IMAGES_ARCH`. Supported architectures include:
 
 - `x86_64` (default)
+- `arm64`
+- `s390x` (currently work in progress)
 
 ### Usage
 The architecture-specific test images class is selected automatically based on the `OPENSHIFT_VIRTUALIZATION_TEST_IMAGES_ARCH` environment variable. If the variable is not set, the default architecture `x86_64` is used.

diff --git a/conftest.py b/conftest.py
@@ -585,24 +585,24 @@ def _update_os_related_config():
         # with runtime windows_os_matrix value(s).
         # Some tests extract a single OS from the matrix and may fail if running with
         # passed values from cli
-        py_config["system_windows_os_matrix"] = py_config["windows_os_matrix"]
-        py_config["system_rhel_os_matrix"] = py_config["rhel_os_matrix"]
+        if windows_os_matrix := py_config.get("windows_os_matrix"):
+            py_config["system_windows_os_matrix"] = windows_os_matrix
+
+        if rhel_os_matrix := py_config.get("rhel_os_matrix"):
+            py_config["system_rhel_os_matrix"] = rhel_os_matrix
 
         # Update OS matrix list with the latest OS if running with os_group
-        if session.config.getoption("latest_rhel"):
-            py_config["rhel_os_matrix"] = [utilities.infra.generate_latest_os_dict(os_list=py_config["rhel_os_matrix"])]
-        if session.config.getoption("latest_windows"):
-            py_config["windows_os_matrix"] = [
-                utilities.infra.generate_latest_os_dict(os_list=py_config["windows_os_matrix"])
-            ]
-        if session.config.getoption("latest_centos"):
-            py_config["centos_os_matrix"] = [
-                utilities.infra.generate_latest_os_dict(os_list=py_config["centos_os_matrix"])
-            ]
-        if session.config.getoption("latest_fedora"):
-            py_config["fedora_os_matrix"] = [
-                utilities.infra.generate_latest_os_dict(os_list=py_config["fedora_os_matrix"])
-            ]
+        if session.config.getoption("latest_rhel") and rhel_os_matrix:
+            py_config["rhel_os_matrix"] = [utilities.infra.generate_latest_os_dict(os_list=rhel_os_matrix)]
+
+        if session.config.getoption("latest_windows") and windows_os_matrix:
+            py_config["windows_os_matrix"] = [utilities.infra.generate_latest_os_dict(os_list=windows_os_matrix)]
+
+        if session.config.getoption("latest_centos") and (centos_os_matrix := py_config.get("centos_os_matrix")):
+            py_config["centos_os_matrix"] = [utilities.infra.generate_latest_os_dict(os_list=centos_os_matrix)]
+
+        if session.config.getoption("latest_fedora") and (fedora_os_matrix := py_config.get("fedora_os_matrix")):
+            py_config["fedora_os_matrix"] = [utilities.infra.generate_latest_os_dict(os_list=fedora_os_matrix)]
 
     data_collector_dict = set_data_collector_values()
     shutil.rmtree(

diff --git a/pytest.ini b/pytest.ini
@@ -72,7 +72,7 @@ addopts =
     -p no:logging
     --basetemp=/tmp/pytest
     --strict-markers
-    --tc-file=tests/global_config.py
+    --tc-file=tests/global_config_x86.py
     --tc-format=python
     --show-progress
     --order-dependencies

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1881,12 +1881,14 @@ def rhel_latest_os_params():
     """This fixture is needed as during collection pytest_testconfig is empty.
     os_params or any globals using py_config in conftest cannot be used.
     """
-    latest_rhel_dict = py_config["latest_rhel_os_dict"]
-    return {
-        "rhel_image_path": f"{get_test_artifact_server_url()}{latest_rhel_dict['image_path']}",
-        "rhel_dv_size": latest_rhel_dict["dv_size"],
-        "rhel_template_labels": latest_rhel_dict["template_labels"],
-    }
+    if latest_rhel_dict := py_config.get("latest_rhel_os_dict"):
+        return {
+            "rhel_image_path": f"{get_test_artifact_server_url()}{latest_rhel_dict['image_path']}",
+            "rhel_dv_size": latest_rhel_dict["dv_size"],
+            "rhel_template_labels": latest_rhel_dict["template_labels"],
+        }
+
+    return {}
 
 
 @pytest.fixture(scope="session")

diff --git a/tests/global_config.py b/tests/global_config.py
@@ -1,9 +1,7 @@
-import os
 from typing import Any
 
 from ocp_resources.datavolume import DataVolume
 from ocp_resources.deployment import Deployment
-from ocp_resources.template import Template
 from ocp_resources.virtual_machine import VirtualMachine
 
 from utilities.constants import (
@@ -20,46 +18,29 @@
     CNV_OPERATORS,
     CNV_PODS_NO_HPP_CSI_HPP_POOL,
     CNV_PROMETHEUS_RULES,
-    DATA_SOURCE_NAME,
-    DV_SIZE_STR,
-    FLAVOR_STR,
     HCO_CATALOG_SOURCE,
     HPP_CAPABILITIES,
-    IMAGE_NAME_STR,
-    IMAGE_PATH_STR,
-    INSTANCE_TYPE_STR,
     IPV4_STR,
     IPV6_STR,
     KUBEVIRT_VMI_CPU_SYSTEM_USAGE_SECONDS_TOTAL_QUERY_STR,
     KUBEVIRT_VMI_CPU_USAGE_SECONDS_TOTAL_QUERY_STR,
     KUBEVIRT_VMI_CPU_USER_USAGE_SECONDS_TOTAL_QUERY_STR,
     KUBEVIRT_VMI_VCPU_DELAY_SECONDS_TOTAL_QUERY_STR,
-    LATEST_RELEASE_STR,
     LINUX_BRIDGE,
-    OS_STR,
-    OS_VERSION_STR,
     OVS_BRIDGE,
-    PREFERENCE_STR,
     PRODUCTION_CATALOG_SOURCE,
     TEKTON_AVAILABLE_PIPELINEREF,
     TEKTON_AVAILABLE_TASKS,
-    TEMPLATE_LABELS_STR,
     TIMEOUT_5MIN,
     TIMEOUT_5SEC,
     TLS_CUSTOM_POLICY,
     TLS_OLD_POLICY,
     VM_CONSOLE_PROXY_CLUSTER_RESOURCES,
     VM_CONSOLE_PROXY_NAMESPACE_RESOURCES,
-    WIN_2K22,
-    WIN_2K25,
-    WIN_10,
-    WIN_11,
-    WORKLOAD_STR,
     Images,
     NamespacesNames,
     StorageClassNames,
 )
-from utilities.infra import get_latest_os_dict_list
 from utilities.storage import HppCsiStorageClass
 
 global config
@@ -199,229 +180,18 @@ def _get_default_storage_class(sc_list):
 
 data_import_cron_matrix = [
     {"centos-stream9": {"instance_type": "u1.medium", "preference": "centos.stream9"}},
-    {"centos-stream10": {"instance_type": "u1.medium", "preference": "centos.stream10"}},
+    {
+        "centos-stream10": {
+            "instance_type": "u1.medium",
+            "preference": "centos.stream10",
+        }
+    },
     {"fedora": {"instance_type": "u1.medium", "preference": "fedora"}},
     {"rhel8": {"instance_type": "u1.medium", "preference": "rhel.8"}},
     {"rhel9": {"instance_type": "u1.medium", "preference": "rhel.9"}},
     {"rhel10": {"instance_type": "u1.medium", "preference": "rhel.10"}},
 ]
 
-rhel_os_matrix = [
-    {
-        "rhel-7-8": {
-            OS_VERSION_STR: "7.8",
-            IMAGE_NAME_STR: Images.Rhel.RHEL7_8_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Rhel.DIR, Images.Rhel.RHEL7_8_IMG),
-            DV_SIZE_STR: Images.Rhel.DEFAULT_DV_SIZE,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: "rhel7.8",
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.TINY,
-            },
-        }
-    },
-    {
-        "rhel-7-9": {
-            OS_VERSION_STR: "7.9",
-            IMAGE_NAME_STR: Images.Rhel.RHEL7_9_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Rhel.DIR, Images.Rhel.RHEL7_9_IMG),
-            DV_SIZE_STR: Images.Rhel.DEFAULT_DV_SIZE,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: "rhel7.9",
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.TINY,
-            },
-        }
-    },
-    {
-        "rhel-8-8": {
-            OS_VERSION_STR: "8.8",
-            IMAGE_NAME_STR: Images.Rhel.RHEL8_8_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Rhel.DIR, Images.Rhel.RHEL8_8_IMG),
-            DV_SIZE_STR: Images.Rhel.DEFAULT_DV_SIZE,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: "rhel8.8",
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.TINY,
-            },
-        }
-    },
-    {
-        "rhel-8-10": {
-            OS_VERSION_STR: "8.10",
-            IMAGE_NAME_STR: Images.Rhel.RHEL8_10_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Rhel.DIR, Images.Rhel.RHEL8_10_IMG),
-            DV_SIZE_STR: Images.Rhel.DEFAULT_DV_SIZE,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: "rhel8.10",
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.TINY,
-            },
-        }
-    },
-    {
-        "rhel-9-4": {
-            OS_VERSION_STR: "9.4",
-            IMAGE_NAME_STR: Images.Rhel.RHEL9_4_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Rhel.DIR, Images.Rhel.RHEL9_4_IMG),
-            DV_SIZE_STR: Images.Rhel.DEFAULT_DV_SIZE,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: "rhel9.4",
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.TINY,
-            },
-        }
-    },
-    {
-        "rhel-9-6": {
-            OS_VERSION_STR: "9.6",
-            IMAGE_NAME_STR: Images.Rhel.RHEL9_6_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Rhel.DIR, Images.Rhel.RHEL9_6_IMG),
-            DV_SIZE_STR: Images.Rhel.DEFAULT_DV_SIZE,
-            LATEST_RELEASE_STR: True,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: "rhel9.6",
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.TINY,
-            },
-        }
-    },
-]
-
-windows_os_matrix = [
-    {
-        "win-10": {
-            OS_VERSION_STR: "10",
-            IMAGE_NAME_STR: Images.Windows.WIN10_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Windows.UEFI_WIN_DIR, Images.Windows.WIN10_IMG),
-            DV_SIZE_STR: Images.Windows.DEFAULT_DV_SIZE,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: WIN_10,
-                WORKLOAD_STR: Template.Workload.DESKTOP,
-                FLAVOR_STR: Template.Flavor.MEDIUM,
-            },
-        }
-    },
-    {
-        "win-2016": {
-            OS_VERSION_STR: "2016",
-            IMAGE_NAME_STR: Images.Windows.WIN2k16_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Windows.UEFI_WIN_DIR, Images.Windows.WIN2k16_IMG),
-            DV_SIZE_STR: Images.Windows.DEFAULT_DV_SIZE,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: "win2k16",
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.MEDIUM,
-            },
-        }
-    },
-    {
-        "win-2019": {
-            OS_VERSION_STR: "2019",
-            IMAGE_NAME_STR: Images.Windows.WIN2k19_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Windows.UEFI_WIN_DIR, Images.Windows.WIN2k19_IMG),
-            DV_SIZE_STR: Images.Windows.DEFAULT_DV_SIZE,
-            LATEST_RELEASE_STR: True,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: "win2k19",
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.MEDIUM,
-            },
-        }
-    },
-    {
-        "win-11": {
-            OS_VERSION_STR: "11",
-            IMAGE_NAME_STR: Images.Windows.WIN11_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Windows.DIR, Images.Windows.WIN11_IMG),
-            DV_SIZE_STR: Images.Windows.DEFAULT_DV_SIZE,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: WIN_11,
-                WORKLOAD_STR: Template.Workload.DESKTOP,
-                FLAVOR_STR: Template.Flavor.MEDIUM,
-            },
-        }
-    },
-    {
-        "win-2022": {
-            OS_VERSION_STR: "2022",
-            IMAGE_NAME_STR: Images.Windows.WIN2022_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Windows.DIR, Images.Windows.WIN2022_IMG),
-            DV_SIZE_STR: Images.Windows.DEFAULT_DV_SIZE,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: WIN_2K22,
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.MEDIUM,
-            },
-        }
-    },
-    {
-        "win-2025": {
-            OS_VERSION_STR: "2025",
-            IMAGE_NAME_STR: Images.Windows.WIN2k25_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Windows.UEFI_WIN_DIR, Images.Windows.WIN2k25_IMG),
-            DV_SIZE_STR: Images.Windows.DEFAULT_DV_SIZE,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: WIN_2K25,
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.MEDIUM,
-            },
-        }
-    },
-]
-
-fedora_os_matrix = [
-    {
-        "fedora-41": {
-            IMAGE_NAME_STR: Images.Fedora.FEDORA41_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.Fedora.DIR, Images.Fedora.FEDORA41_IMG),
-            DV_SIZE_STR: Images.Fedora.DEFAULT_DV_SIZE,
-            LATEST_RELEASE_STR: True,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: "fedora41",
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.SMALL,
-            },
-        }
-    },
-]
-
-centos_os_matrix = [
-    {
-        "centos-stream-9": {
-            IMAGE_NAME_STR: Images.CentOS.CENTOS_STREAM_9_IMG,
-            IMAGE_PATH_STR: os.path.join(Images.CentOS.DIR, Images.CentOS.CENTOS_STREAM_9_IMG),
-            DV_SIZE_STR: Images.CentOS.DEFAULT_DV_SIZE,
-            LATEST_RELEASE_STR: True,
-            TEMPLATE_LABELS_STR: {
-                OS_STR: "centos-stream9",
-                WORKLOAD_STR: Template.Workload.SERVER,
-                FLAVOR_STR: Template.Flavor.TINY,
-            },
-        }
-    },
-]
-
-instance_type_rhel_os_matrix = [
-    {
-        "rhel-10": {
-            OS_VERSION_STR: "10",
-            DV_SIZE_STR: Images.Rhel.DEFAULT_DV_SIZE,
-            INSTANCE_TYPE_STR: "u1.medium",
-            PREFERENCE_STR: "rhel.10",
-            DATA_SOURCE_NAME: "rhel10",
-            LATEST_RELEASE_STR: True,
-        }
-    },
-]
-
-(
-    latest_rhel_os_dict,
-    latest_windows_os_dict,
-    latest_fedora_os_dict,
-    latest_centos_os_dict,
-) = get_latest_os_dict_list(os_list=[rhel_os_matrix, windows_os_matrix, fedora_os_matrix, centos_os_matrix])
-
 ip_stack_version_matrix = [
     IPV4_STR,
     IPV6_STR,