Skip to content

Commit 7c7b269

Browse files
Satheespre-commit-ci[bot]
andauthored
Include fedora and centos os matrix for ARM cluster (RedHatQE#2430)
Updated config file to include fedora and centos os matrix for ARM cluster ##### Short description: ARM config file lacks information for fedora and centos os matrix. Earlier, ARM tests ran good as some of the tests were using cirros. Now few tests uses fedora and centos images, and the test fails with missing fedora & centos os matrix. So this PR adds those os matrix to the config file ##### More details: This PR adds Fedora/Centos OS matrix for ARM cluster env. Without this fix, test run fails. ##### What this PR does / why we need it: ##### Which issue(s) this PR fixes: ##### Special notes for reviewer: ##### jira-ticket: https://issues.redhat.com/browse/CNV-71815 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added Fedora and CentOS OS matrices for ARM64 and updated selection to expose latest entries for multiple OS families. * Removed legacy CentOS-specific instance-type matrix. * **Chores** * Standardized disk and QCOW2 image names across architectures with new shared constants. * Reworked ARM64 and s390x image configurations to use standardized names, derived Cirros filenames, and explicit latest-release references. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent e85c5c6 commit 7c7b269

2 files changed

Lines changed: 33 additions & 15 deletions

File tree

tests/global_config_arm64.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from utilities.constants import (
66
ARM_64,
7-
CENTOS_STREAM10_PREFERENCE,
87
EXPECTED_CLUSTER_INSTANCE_TYPE_LABELS,
98
HPP_CAPABILITIES,
109
OS_FLAVOR_FEDORA,
@@ -53,21 +52,21 @@
5352
storage_class_b = StorageClassNames.IO2_CSI
5453

5554
rhel_os_matrix = generate_os_matrix_dict(os_name="rhel", supported_operating_systems=["rhel-9-5", "rhel-9-6"])
55+
fedora_os_matrix = generate_os_matrix_dict(os_name="fedora", supported_operating_systems=["fedora-42"])
56+
centos_os_matrix = generate_os_matrix_dict(os_name="centos", supported_operating_systems=["centos-stream-9"])
5657

57-
latest_rhel_os_dict = get_latest_os_dict_list(os_list=[rhel_os_matrix])[0]
58+
latest_rhel_os_dict, latest_fedora_os_dict, latest_centos_os_dict = get_latest_os_dict_list(
59+
os_list=[rhel_os_matrix, fedora_os_matrix, centos_os_matrix]
60+
)
5861

5962
# Modify instance_type_rhel_os_matrix for arm64
6063
instance_type_rhel_os_matrix = generate_linux_instance_type_os_matrix(
6164
os_name="rhel", preferences=[RHEL10_PREFERENCE], arch_suffix=ARM_64
6265
)
63-
instance_type_centos_os_matrix = generate_linux_instance_type_os_matrix(
64-
os_name="centos.stream", preferences=[CENTOS_STREAM10_PREFERENCE]
65-
)
6666
instance_type_fedora_os_matrix = generate_linux_instance_type_os_matrix(
6767
os_name=OS_FLAVOR_FEDORA, preferences=[OS_FLAVOR_FEDORA], arch_suffix=ARM_64
6868
)
6969

70-
7170
for _dir in dir():
7271
if not config: # noqa: F821
7372
config: dict[str, Any] = {}

utilities/constants.py

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
OS_FLAVOR_RHEL = "rhel"
5050
OS_FLAVOR_FEDORA = "fedora"
5151

52+
FEDORA_DISK_DEMO = "fedora-cloud-registry-disk-demo"
53+
CIRROS_DISK_DEMO = "cirros-registry-disk-demo"
54+
CIRROS_QCOW2_IMG = "cirros-qcow2.img"
55+
5256

5357
class ArchImages:
5458
class X86_64: # noqa: N801
@@ -61,7 +65,7 @@ class X86_64: # noqa: N801
6165
QCOW2_IMG=f"{BASE_CIRROS_NAME}.qcow2",
6266
QCOW2_IMG_GZ=f"{BASE_CIRROS_NAME}.qcow2.gz",
6367
QCOW2_IMG_XZ=f"{BASE_CIRROS_NAME}.qcow2.xz",
64-
DISK_DEMO="cirros-registry-disk-demo",
68+
DISK_DEMO=CIRROS_DISK_DEMO,
6569
)
6670

6771
Alpine = Alpine(
@@ -101,19 +105,26 @@ class X86_64: # noqa: N801
101105
FEDORA42_IMG="Fedora-Cloud-Base-Generic-42-1.1.x86_64.qcow2",
102106
FEDORA43_IMG="Fedora-Cloud-Base-Generic-43-1.6.x86_64.qcow2",
103107
FEDORA_CONTAINER_IMAGE="quay.io/openshift-cnv/qe-cnv-tests-fedora:41",
104-
DISK_DEMO="fedora-cloud-registry-disk-demo",
108+
DISK_DEMO=FEDORA_DISK_DEMO,
105109
)
106110
Fedora.LATEST_RELEASE_STR = Fedora.FEDORA43_IMG
107111

108112
Centos = Centos(CENTOS_STREAM_9_IMG="CentOS-Stream-GenericCloud-9-20220107.0.x86_64.qcow2")
109113
Centos.LATEST_RELEASE_STR = Centos.CENTOS_STREAM_9_IMG
110114

111-
Cdi = Cdi(QCOW2_IMG="cirros-qcow2.img")
115+
Cdi = Cdi(QCOW2_IMG=CIRROS_QCOW2_IMG)
112116

113117
class ARM64:
118+
BASE_CIRROS_NAME = "cirros-0.5.2-aarch64-disk"
114119
BASE_ALPINE_NAME = "alpine-aarch64-disk"
115120
Cirros = Cirros(
116-
RAW_IMG_XZ="cirros-0.4.0-aarch64-disk.raw.xz",
121+
RAW_IMG=f"{BASE_CIRROS_NAME}.raw",
122+
RAW_IMG_GZ=f"{BASE_CIRROS_NAME}.raw.gz",
123+
RAW_IMG_XZ=f"{BASE_CIRROS_NAME}.raw.xz",
124+
QCOW2_IMG=f"{BASE_CIRROS_NAME}.qcow2",
125+
QCOW2_IMG_GZ=f"{BASE_CIRROS_NAME}.qcow2.gz",
126+
QCOW2_IMG_XZ=f"{BASE_CIRROS_NAME}.qcow2.xz",
127+
DISK_DEMO=CIRROS_DISK_DEMO,
117128
)
118129

119130
Alpine = Alpine(
@@ -127,9 +138,17 @@ class ARM64:
127138
Rhel.LATEST_RELEASE_STR = Rhel.RHEL9_6_IMG
128139

129140
Windows = Windows()
130-
Fedora = Fedora()
131-
Centos = Centos()
132-
Cdi = Cdi()
141+
Fedora = Fedora(
142+
FEDORA42_IMG="Fedora-Cloud-Base-Generic-42-1.1.aarch64.qcow2",
143+
FEDORA_CONTAINER_IMAGE="quay.io/openshift-cnv/qe-cnv-tests-fedora:41-arm64",
144+
DISK_DEMO=FEDORA_DISK_DEMO,
145+
)
146+
Fedora.LATEST_RELEASE_STR = Fedora.FEDORA42_IMG
147+
148+
Centos = Centos(CENTOS_STREAM_9_IMG="CentOS-Stream-GenericCloud-9-latest.aarch64.qcow2")
149+
Centos.LATEST_RELEASE_STR = Centos.CENTOS_STREAM_9_IMG
150+
151+
Cdi = Cdi(QCOW2_IMG=CIRROS_QCOW2_IMG)
133152

134153
class S390X:
135154
BASE_ALPINE_NAME = "alpine-s390x-disk"
@@ -141,7 +160,7 @@ class S390X:
141160
QCOW2_IMG="Fedora-Cloud-Base-Generic-41-1.4.s390x.qcow2",
142161
QCOW2_IMG_GZ="Fedora-Cloud-Base-Generic-41-1.4.s390x.qcow2.gz",
143162
QCOW2_IMG_XZ="Fedora-Cloud-Base-Generic-41-1.4.s390x.qcow2.xz",
144-
DISK_DEMO="fedora-cloud-registry-disk-demo",
163+
DISK_DEMO=FEDORA_DISK_DEMO,
145164
DIR=f"{BASE_IMAGES_DIR}/fedora-images",
146165
DEFAULT_DV_SIZE="10Gi",
147166
DEFAULT_MEMORY_SIZE="1Gi",
@@ -166,7 +185,7 @@ class S390X:
166185
Fedora = Fedora(
167186
FEDORA42_IMG="Fedora-Cloud-Base-Generic-42-1.1.s390x.qcow2",
168187
FEDORA_CONTAINER_IMAGE="quay.io/openshift-cnv/qe-cnv-tests-fedora:41-s390x",
169-
DISK_DEMO="fedora-cloud-registry-disk-demo",
188+
DISK_DEMO=FEDORA_DISK_DEMO,
170189
)
171190
Fedora.LATEST_RELEASE_STR = Fedora.FEDORA42_IMG
172191

0 commit comments

Comments
 (0)