Remove ubuntu2404 from lustre integ tests

Author: hgreebe

cli/src/pcluster/constants.py

@@ -38,6 +38,7 @@
 UNSUPPORTED_OSES_FOR_MICRO_NANO = ["ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"]
 UNSUPPORTED_OSES_FOR_DCV = ["alinux2023"]
 UNSUPPORTED_ARM_OSES_FOR_DCV = ["ubuntu2004"]
+UNSUPPORTED_OSES_FOR_LUSTRE = ["ubuntu2404"]
 DELETE_POLICY = "Delete"
 RETAIN_POLICY = "Retain"
 DELETION_POLICIES = [DELETE_POLICY, RETAIN_POLICY]

tests/integration-tests/configs/develop.yaml

@@ -543,65 +543,65 @@ test-suites:
       dimensions:
         - regions: ["eu-west-2"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_6 }}]
+          oss: [{{ LUSTRE_OS_X86_2 }}]
           schedulers: ["slurm"]
         - regions: ["eu-north-1"]
           instances: {{ common.INSTANCES_DEFAULT_ARM }}
-          oss: [{{ OS_ARM_1 }}]
+          oss: [{{ LUSTRE_OS_ARM_1 }}]
           schedulers: ["slurm"]
     test_fsx_lustre.py::test_fsx_lustre_dra:
       dimensions:
         - regions: [ "eu-west-2" ]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_3 }}]
+          oss: [{{ LUSTRE_OS_X86_3 }}]
           schedulers: [ "slurm" ]
         - regions: [ "eu-north-1" ]
           instances: {{ common.INSTANCES_DEFAULT_ARM }}
-          oss: [{{ OS_ARM_5 }}]
+          oss: [{{ LUSTRE_OS_ARM_4 }}]
           schedulers: [ "slurm" ]
     test_fsx_lustre.py::test_file_cache:
       dimensions:
         - regions: [ "eu-north-1" ]
           instances: {{ common.INSTANCES_DEFAULT_ARM }}
-          oss: [{{ OS_ARM_7 }}]
+          oss: [{{ LUSTRE_OS_ARM_3 }}]
           schedulers: [ "slurm" ]
     # The checks performed in test_multiple_fsx is the same as test_fsx_lustre.
     # We should consider this when assigning dimensions to each test.
     test_fsx_lustre.py::test_multiple_fsx:
       dimensions:
         - regions: ["eu-west-2"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_0 }}]
+          oss: [{{ LUSTRE_OS_X86_0 }}]
           schedulers: ["slurm"]
         - regions: ["eu-west-2"]
           instances: {{ common.INSTANCES_DEFAULT_ARM }}
-          oss: [{{ OS_ARM_2 }}]
+          oss: [{{ LUSTRE_OS_ARM_2 }}]
           schedulers: ["slurm"]
         - regions: ["cn-north-1"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_4 }}]
+          oss: [{{ LUSTRE_OS_X86_4 }}]
           schedulers: ["slurm"]
         - regions: [ "us-gov-west-1" ]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_6 }}]
+          oss: [{{ LUSTRE_OS_X86_5 }}]
           schedulers: [ "slurm" ]
     test_fsx_lustre.py::test_multi_az_fsx:
       dimensions:
         - regions: ["eu-west-2"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_1 }}]
+          oss: [{{ LUSTRE_OS_X86_1 }}]
           schedulers: ["slurm"]
     test_fsx_lustre.py::test_fsx_lustre_configuration_options:
       dimensions:
         - regions: ["us-east-2"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_3 }}]
+          oss: [{{ LUSTRE_OS_X86_3 }}]
           schedulers: ["slurm"]
     test_fsx_lustre.py::test_fsx_lustre_backup:
       dimensions:
         - regions: ["us-west-1"]
           instances: {{ common.INSTANCES_DEFAULT_ARM }}
-          oss: [{{ OS_ARM_5 }}]
+          oss: [{{ LUSTRE_OS_ARM_0 }}]
           schedulers: ["slurm"]
     # EFS tests can be done in any region.
     test_efs.py::test_efs_compute_az:

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

@@ -19,7 +19,12 @@
 from jinja2.sandbox import SandboxedEnvironment
 from utils import InstanceTypesData
 
-from pcluster.constants import SUPPORTED_OSES, UNSUPPORTED_ARM_OSES_FOR_DCV, UNSUPPORTED_OSES_FOR_DCV
+from pcluster.constants import (
+    SUPPORTED_OSES,
+    UNSUPPORTED_ARM_OSES_FOR_DCV,
+    UNSUPPORTED_OSES_FOR_DCV,
+    UNSUPPORTED_OSES_FOR_LUSTRE,
+)
 
 
 def _get_os_parameters(config=None, args=None):
@@ -52,6 +57,17 @@ def _get_os_parameters(config=None, args=None):
             (today_number + index) % len(dcv_available_amis_oss_arm)
         ]
 
+    lustre_supported_oses = [os for os in SUPPORTED_OSES if os not in UNSUPPORTED_OSES_FOR_LUSTRE]
+    lustre_available_amis_oss_x86 = list(set(lustre_supported_oses) & set(available_amis_oss_x86))
+    lustre_available_amis_oss_arm = list(set(lustre_supported_oses) & set(available_amis_oss_arm))
+    for index in range(len(dcv_supported_oses)):
+        result[f"LUSTRE_OS_X86_{index}"] = lustre_available_amis_oss_x86[
+            (today_number + index) % len(lustre_available_amis_oss_x86)
+        ]
+        result[f"LUSTRE_OS_ARM_{index}"] = lustre_available_amis_oss_arm[
+            (today_number + index) % len(lustre_available_amis_oss_arm)
+        ]
+
     no_rhel_oss = [os for os in SUPPORTED_OSES if "rhel" not in os]
     no_rhel_oss_x86 = list(set(no_rhel_oss) & set(available_amis_oss_x86))
     no_rhel_oss_arm = list(set(no_rhel_oss) & set(available_amis_oss_arm))