[integ-tests] Rotate OSes for EFA tests

Signed-off-by: Hanwen <[email protected]>
hanwen-pcluste · Nov 12, 2024 · 6980810 · 6980810
1 parent 82653c2
commit 6980810
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/tests/integration-tests/configs/develop.yaml b/tests/integration-tests/configs/develop.yaml
@@ -267,23 +267,23 @@ test-suites:
       dimensions:
         - regions: ["euw1-az1"]  # do not move, unless capacity reservation is moved as well
           instances: ["c5n.18xlarge"]
-          oss: ["rhel9"]
+          oss: [{{ OS_X86_0 }}]
           schedulers: ["slurm"]
         - regions: ["use1-az6"]   # do not move, unless capacity reservation is moved as well
           instances: ["p4d.24xlarge"]
-          oss: ["alinux2"]
+          oss: [{{ NO_RHEL_OS_X86_1 }}]  # The capacity reservation cannot use RHEL operating system
           schedulers: ["slurm"]
         - regions: ["use1-az6"]  # do not move, unless capacity reservation is moved as well
           instances: ["c6gn.16xlarge"]
-          oss: ["rhel8"]
+          oss: [{{ OS_X86_2 }}]
           schedulers: ["slurm"]
         - regions: ["use2-az2"]  # do not move, unless instance type support is moved as well
           instances: ["hpc6id.32xlarge"]
-          oss: ["rocky9"]
+          oss: [{{ OS_X86_4 }}]
           schedulers: [ "slurm" ]
         - regions: ["use2-az2"]  # do not move, unless instance type support is moved as well
           instances: [{{ common.instance("instance_type_1") }}]
-          oss: ["ubuntu2204"]
+          oss: [{{ OS_X86_6 }}]
           schedulers: [ "slurm" ]
   health_checks:
     test_gpu_health_checks.py::test_cluster_with_gpu_health_checks:

diff --git a/tests/integration-tests/framework/tests_configuration/config_renderer.py b/tests/integration-tests/framework/tests_configuration/config_renderer.py
@@ -48,6 +48,16 @@ def _get_os_parameters(config=None, args=None):
         result[f"DCV_OS_ARM_{index}"] = dcv_available_amis_oss_arm[
             (today_number + index) % len(dcv_available_amis_oss_arm)
         ]
+
+    no_rhel_oss_x86 = [os for os in available_amis_oss_x86 if "rhel" not in os]
+    no_rhel_oss_arm = [os for os in available_amis_oss_arm if "rhel" not in os]
+    for index in range(len(dcv_supported_oses)):
+        result[f"NO_RHEL_OS_X86_{index}"] = no_rhel_oss_x86[
+            (today_number + index) % len(no_rhel_oss_x86)
+        ]
+        result[f"NO_RHEL_OS_ARM_{index}"] = no_rhel_oss_arm[
+            (today_number + index) % len(no_rhel_oss_arm)
+        ]
     return result