infra: align tests to fit multiarch needs (#4788)

Update multiarch matrix generation so preference and DataSource names
match architecture-specific cluster naming for RHEL, Fedora, and CentOS.

##### Short description:

##### More details:

##### What this PR does / why we need it:

##### Which issue(s) this PR fixes:

##### Special notes for reviewer:
rrmngmnt's package manager auto-detection uses which to find the package
manager binary which is not available in centos-stream10 and hence some
of tests didn't work.
8e0f430
is to fix it.
##### jira-ticket:
https://redhat.atlassian.net/browse/CNV-64577


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **New Features**
* Extended support for ARM_64 architecture with CentOS Stream 10
preference configuration
* Enhanced architecture preference handling to provide more flexible
configuration options

* **Bug Fixes**
  * Improved QEMU guest agent presence detection methodology

* **Tests**
* Expanded test coverage for instance-type OS matrix generation with
parametrized test cases
* Added validation for architecture-specific configurations and
preference handling

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Signed-off-by: Geetika Kapoor <gkapoor@redhat.com>

Author: geetikakay

tests/global_config_multiarch.py

@@ -58,6 +58,7 @@
         "centos_os_list": ["centos-stream-9"],
         "instance_type_rhel_os_list": [RHEL10_PREFERENCE],
         "instance_type_fedora_os_list": [OS_FLAVOR_FEDORA],
+        "instance_type_centos_os_list": [CENTOS_STREAM10_PREFERENCE],
     },
 }
 

tests/infrastructure/instance_types/supported_os/conftest.py

@@ -131,7 +131,9 @@ def golden_image_windows_vm(
         vm_instance_type=VirtualMachineClusterInstancetype(client=unprivileged_client, name="u1.large"),
         vm_preference=VirtualMachineClusterPreference(
             client=unprivileged_client,
-            name=windows_os_matrix__module__[os_name][DATA_SOURCE_STR].replace("win", "windows."),
+            name=windows_os_matrix__module__[os_name][DATA_SOURCE_STR]
+            .removesuffix(f"-{py_config.get('cpu_arch', '')}")
+            .replace("win", "windows."),
         ),
         data_volume_template=windows_data_volume_template.res,
         os_flavor=OS_FLAVOR_WIN_CONTAINER_DISK,

utilities/os_utils.py

@@ -255,7 +255,10 @@ def generate_os_matrix_dict(
 
 
 def generate_linux_instance_type_os_matrix(
-    os_name: str, preferences: list[str], arch_suffix: str | None = None
+    os_name: str,
+    preferences: list[str],
+    arch_suffix: str | None = None,
+    add_arch_suffix: bool = True,
 ) -> list[dict[str, dict[str, Any]]]:
     """
     Generate a list of dictionaries representing the instance type matrix for a Linux OS type.
@@ -265,6 +268,9 @@ def generate_linux_instance_type_os_matrix(
         os_name (str): The name of the OS.
         preferences (list[str]): A list of preferences for the instance types. Preference format is "<os>.<version>".
         arch_suffix: Optional architecture suffix. Example: "s390x", "arm64" . Omit to keep original preference.
+        add_arch_suffix: When True, append arch_suffix to the preference name. Set to False for OSes whose
+            ClusterPreferences have no arch suffix (e.g. centos — "centos.stream10" exists,
+            "centos.stream10.arm64" does not).
 
     Returns:
         list[dict[str, dict[str, Any]]]: A list of dictionaries representing the instance type matrix.
@@ -285,10 +291,11 @@ def _format_data_source_name(preference_name: str) -> str:
     instance_types: list[dict[str, dict[str, Any]]] = []
 
     for preference in preferences:
-        arch_preference = f"{preference}.{arch_suffix}" if arch_suffix else preference
+        arch_preference = f"{preference}.{arch_suffix}" if arch_suffix and add_arch_suffix else preference
+        data_source_name = _format_data_source_name(preference_name=preference)
         preference_config: dict[str, Any] = {
             PREFERENCE_STR: arch_preference,
-            DATA_SOURCE_NAME: _format_data_source_name(preference_name=preference),
+            DATA_SOURCE_NAME: f"{data_source_name}-{arch_suffix}" if arch_suffix else data_source_name,
         }
 
         if preference == latest_os:

utilities/pytest_utils.py

@@ -508,22 +508,31 @@ def generate_instance_type_matrix_dicts(os_dict: dict[str, Any], cpu_arch: str |
             "instance_type_rhel_os_list").
         cpu_arch: Optional architecture suffix.
     """
+    add_arch_suffix = cpu_arch != AMD_64
+
     if instance_type_rhel_os_list := os_dict.get("instance_type_rhel_os_list"):
         py_config["instance_type_rhel_os_matrix"] = generate_linux_instance_type_os_matrix(
-            os_name="rhel", preferences=instance_type_rhel_os_list, arch_suffix=cpu_arch
+            os_name="rhel",
+            preferences=instance_type_rhel_os_list,
+            arch_suffix=cpu_arch,
+            add_arch_suffix=add_arch_suffix,
         )
         py_config["latest_instance_type_rhel_os_dict"] = generate_latest_os_dict(
             os_matrix=py_config["instance_type_rhel_os_matrix"]
         )
     if instance_type_fedora_os_list := os_dict.get("instance_type_fedora_os_list"):
         py_config["instance_type_fedora_os_matrix"] = generate_linux_instance_type_os_matrix(
-            os_name="fedora", preferences=instance_type_fedora_os_list, arch_suffix=cpu_arch
+            os_name="fedora",
+            preferences=instance_type_fedora_os_list,
+            arch_suffix=cpu_arch,
+            add_arch_suffix=add_arch_suffix,
         )
     if instance_type_centos_os_list := os_dict.get("instance_type_centos_os_list"):
         py_config["instance_type_centos_os_matrix"] = generate_linux_instance_type_os_matrix(
             os_name="centos.stream",
             preferences=instance_type_centos_os_list,
-            arch_suffix=None,
+            arch_suffix=cpu_arch,
+            add_arch_suffix=False,
         )
 
 

utilities/unittests/test_os_utils.py

@@ -6,6 +6,7 @@
 
 import pytest
 
+from utilities.constants import ARM_64, CENTOS_STREAM10_PREFERENCE, RHEL10_PREFERENCE
 from utilities.exceptions import OsDictNotFoundError
 from utilities.os_utils import (
     CENTOS_OS_MAPPING,
@@ -332,6 +333,42 @@ def test_generate_instance_type_single_digit_versions(self):
         rhel9_item = next(item for item in result if "rhel-9" in item)
         assert rhel9_item["rhel-9"]["latest_released"] is True
 
+    def test_arch_suffix_applied_to_preference_and_data_source(self):
+        """arch_suffix is appended to both the preference name and the DataSource."""
+        result = generate_linux_instance_type_os_matrix(
+            os_name="rhel",
+            preferences=[RHEL10_PREFERENCE],
+            arch_suffix=ARM_64,
+        )
+
+        config = result[0][f"{RHEL10_PREFERENCE}.{ARM_64}"]
+        assert config["preference"] == f"{RHEL10_PREFERENCE}.{ARM_64}"
+        assert config["DATA_SOURCE_NAME"] == f"rhel10-{ARM_64}"
+
+    def test_arch_suffix_omitted_from_preference_when_add_arch_suffix_false(self):
+        """add_arch_suffix=False keeps the preference plain while the DataSource still gets the arch suffix."""
+        result = generate_linux_instance_type_os_matrix(
+            os_name="centos.stream",
+            preferences=[CENTOS_STREAM10_PREFERENCE],
+            arch_suffix=ARM_64,
+            add_arch_suffix=False,
+        )
+
+        config = result[0][CENTOS_STREAM10_PREFERENCE]
+        assert config["preference"] == CENTOS_STREAM10_PREFERENCE, "preference must not include arch suffix"
+        assert config["DATA_SOURCE_NAME"] == f"centos-stream10-{ARM_64}", "DataSource must include arch suffix"
+
+    def test_add_arch_suffix_false_no_arch_suffix(self):
+        """add_arch_suffix=False with no arch_suffix is a no-op."""
+        result_default = generate_linux_instance_type_os_matrix(
+            os_name="centos.stream", preferences=[CENTOS_STREAM10_PREFERENCE]
+        )
+        result_no_arch = generate_linux_instance_type_os_matrix(
+            os_name="centos.stream", preferences=[CENTOS_STREAM10_PREFERENCE], add_arch_suffix=False
+        )
+
+        assert result_default == result_no_arch
+
 
 class TestOsMappingsConstants:
     """Test cases for OS mapping constants"""