Skip to content

Commit b590167

Browse files
hanwen-clusterhanwen-pcluste
authored andcommitted
[integ-tests] Rotate OSes for EFA tests
Signed-off-by: Hanwen <hanwenli@amazon.com>
1 parent 82653c2 commit b590167

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

tests/integration-tests/configs/develop.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,23 +267,23 @@ test-suites:
267267
dimensions:
268268
- regions: ["euw1-az1"] # do not move, unless capacity reservation is moved as well
269269
instances: ["c5n.18xlarge"]
270-
oss: ["rhel9"]
270+
oss: [{{ OS_X86_0 }}]
271271
schedulers: ["slurm"]
272272
- regions: ["use1-az6"] # do not move, unless capacity reservation is moved as well
273273
instances: ["p4d.24xlarge"]
274-
oss: ["alinux2"]
274+
oss: [{{ NO_RHEL_OS_X86_1 }}] # The capacity reservation cannot use RHEL operating system
275275
schedulers: ["slurm"]
276276
- regions: ["use1-az6"] # do not move, unless capacity reservation is moved as well
277277
instances: ["c6gn.16xlarge"]
278-
oss: ["rhel8"]
278+
oss: [{{ OS_X86_2 }}]
279279
schedulers: ["slurm"]
280280
- regions: ["use2-az2"] # do not move, unless instance type support is moved as well
281281
instances: ["hpc6id.32xlarge"]
282-
oss: ["rocky9"]
282+
oss: [{{ OS_X86_4 }}]
283283
schedulers: [ "slurm" ]
284284
- regions: ["use2-az2"] # do not move, unless instance type support is moved as well
285285
instances: [{{ common.instance("instance_type_1") }}]
286-
oss: ["ubuntu2204"]
286+
oss: [{{ OS_X86_6 }}]
287287
schedulers: [ "slurm" ]
288288
health_checks:
289289
test_gpu_health_checks.py::test_cluster_with_gpu_health_checks:

tests/integration-tests/framework/tests_configuration/config_renderer.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ def _get_os_parameters(config=None, args=None):
4848
result[f"DCV_OS_ARM_{index}"] = dcv_available_amis_oss_arm[
4949
(today_number + index) % len(dcv_available_amis_oss_arm)
5050
]
51+
52+
no_rhel_oss = [os for os in SUPPORTED_OSES if "rhel" not in os]
53+
no_rhel_oss_x86 = list(set(no_rhel_oss) & set(available_amis_oss_x86))
54+
no_rhel_oss_arm = list(set(no_rhel_oss) & set(available_amis_oss_arm))
55+
for index in range(len(no_rhel_oss)):
56+
result[f"NO_RHEL_OS_X86_{index}"] = no_rhel_oss_x86[(today_number + index) % len(no_rhel_oss_x86)]
57+
result[f"NO_RHEL_OS_ARM_{index}"] = no_rhel_oss_arm[(today_number + index) % len(no_rhel_oss_arm)]
5158
return result
5259

5360

0 commit comments

Comments
 (0)