Add ubuntu24 AMI search to test utils

Author: hgreebe

CHANGELOG.md

@@ -3,7 +3,7 @@ CHANGELOG
 3.13.0
 ------
 **ENHANCEMENTS**
-- Add support Ubuntu2404
+- Add support for Ubuntu24.
 - Add support for ap-southeast-5 region.
 
 **CHANGES**

cli/src/pcluster/resources/imagebuilder/parallelcluster_validate.yaml

@@ -42,7 +42,7 @@ phases:
                 OS='ubuntu2004'
               elif [ `echo "${RELEASE}" | grep '^ubuntu\.22'` ]; then
                 OS='ubuntu2204'
-              elif [ `echo "${!RELEASE}" | grep '^ubuntu\.24'` ]; then
+              elif [ `echo "${RELEASE}" | grep '^ubuntu\.24'` ]; then
                 OS='ubuntu2404'
               elif [ `echo "${RELEASE}" | grep '^rhel\.8'` ]; then
                 OS='rhel8'

tests/integration-tests/configs/develop.yaml

@@ -8,11 +8,11 @@ test-suites:
       dimensions:
         - regions: [ "ap-southeast-1" ]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [ {{ OS_X86_0 }}, {{ OS_X86_2 }}]
+          oss: [ {{ LUSTRE_OS_X86_0 }}, {{ LUSTRE_OS_X86_2 }}]
           schedulers: ["slurm"]
         - regions: ["ap-northeast-1"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_4 }}, {{ OS_X86_6 }}]
+          oss: [{{ LUSTRE_OS_X86_4 }}, {{ LUSTRE_OS_X86_6 }}]
           schedulers: ["slurm"]
   basic:
     test_essential_features.py::test_essential_features:
@@ -341,7 +341,7 @@ test-suites:
       dimensions:
         - regions: ["il-central-1"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_6 }}]
+          oss: [{{ LUSTRE_OS_X86_6 }}]
           schedulers: ["slurm"]
     test_cluster_networking.py::test_existing_eip:
       dimensions:
@@ -361,15 +361,15 @@ test-suites:
         # S3 bucket belonging to the same region and S3 VPC Endpoints only work within the region.
         - regions: ["us-east-1"]
           instances: {{ common.INSTANCES_DEFAULT_ARM }}
-          oss: [{{ DCV_OS_ARM_3 }}]
+          oss: ["rhel8"]
           schedulers: ["slurm"]
         - regions: ["cn-north-1"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ DCV_OS_X86_3 }}]
+          oss: ["ubuntu2204"]
           schedulers: ["slurm"]
         - regions: ["us-gov-west-1"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ DCV_OS_X86_4 }}]
+          oss: ["alinux2"]
           schedulers: ["slurm"]
     test_multi_cidr.py::test_multi_cidr:
       dimensions:
@@ -387,7 +387,7 @@ test-suites:
       dimensions:
         - regions: ["ap-southeast-3"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_6 }}]
+          oss: [{{ LUSTRE_OS_X86_6 }}]
           schedulers: ["slurm"]
     test_placement_group.py::test_placement_group:
       dimensions:
@@ -709,7 +709,7 @@ test-suites:
       dimensions:
         - regions: [ "us-west-1" ]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_0 }}]
+          oss: [{{ LUSTRE_OS_X86_0 }}]
           schedulers: [ "slurm" ]
   pcluster_api:
     test_api_infrastructure.py::test_api_infrastructure_with_default_parameters:
@@ -783,13 +783,13 @@ test-suites:
       dimensions:
         - regions: ["eu-west-2"]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_2 }}]
+          oss: [{{ LUSTRE_OS_X86_2 }}]
           schedulers: ["slurm"]
     test_update.py::test_dynamic_file_systems_update_data_loss:
       dimensions:
         - regions: [ "eu-west-2" ]
           instances: {{ common.INSTANCES_DEFAULT_X86 }}
-          oss: [{{ OS_X86_4 }}]
+          oss: [{{ LUSTRE_OS_X86_4 }}]
           schedulers: [ "slurm" ]
     test_update.py::test_dynamic_file_systems_update_rollback:
       dimensions:

tests/integration-tests/tests/common/utils.py

@@ -45,6 +45,10 @@
         "name": "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-server-*",
         "owners": ["099720109477"],
     },
+    "ubuntu2404": {
+        "name": "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-*-server-*",
+        "owners": ["099720109477"],
+    },
     # FIXME: unpin once Lustre client is available for RHEL8.9
     # FIXME: when fixed upstream, unpin the timestamp introduced because the `kernel-devel` package was missing for
     # the kernel released in 20231127 RHEL 8.8 AMI
@@ -83,6 +87,7 @@
     "alinux2023": {"name": "amzn2023-hvm-*-*", "owners": PCLUSTER_AMI_OWNERS},
     "ubuntu2004": {"name": "ubuntu-2004-lts-hvm-*-*", "owners": PCLUSTER_AMI_OWNERS},
     "ubuntu2204": {"name": "ubuntu-2204-lts-hvm-*-*", "owners": PCLUSTER_AMI_OWNERS},
+    "ubuntu2404": {"name": "ubuntu-2404-lts-hvm-*-*", "owners": PCLUSTER_AMI_OWNERS},
     "rhel8": {"name": "rhel8-hvm-*-*", "owners": PCLUSTER_AMI_OWNERS},
     "rocky8": {"name": "rocky8-hvm-*-*", "owners": PCLUSTER_AMI_OWNERS},
     "rhel9": {"name": "rhel9-hvm-*-*", "owners": PCLUSTER_AMI_OWNERS},
@@ -95,6 +100,7 @@
     "alinux2023": {"name": "first-stage-aws-parallelcluster-*-amzn2023-*", "owners": FIRST_STAGE_AMI_OWNERS},
     "ubuntu2004": {"name": "first-stage-aws-parallelcluster-*-ubuntu-2004-*", "owners": FIRST_STAGE_AMI_OWNERS},
     "ubuntu2204": {"name": "first-stage-aws-parallelcluster-*-ubuntu-2204-*", "owners": FIRST_STAGE_AMI_OWNERS},
+    "ubuntu2404": {"name": "first-stage-aws-parallelcluster-*-ubuntu-2404-*", "owners": FIRST_STAGE_AMI_OWNERS},
     "rhel8": {"name": "first-stage-aws-parallelcluster-*-rhel8-*", "owners": FIRST_STAGE_AMI_OWNERS},
     "rocky8": {"name": "first-stage-aws-parallelcluster-*-rocky8-*", "owners": FIRST_STAGE_AMI_OWNERS},
     "rhel9": {"name": "first-stage-aws-parallelcluster-*-rhel9-*", "owners": FIRST_STAGE_AMI_OWNERS},

tests/integration-tests/utils.py

@@ -535,6 +535,7 @@ def get_username_for_os(os):
         "alinux2023": "ec2-user",
         "ubuntu2004": "ubuntu",
         "ubuntu2204": "ubuntu",
+        "ubuntu2404": "ubuntu",
         "rhel8": "ec2-user",
         "rocky8": "rocky",
         "rhel9": "ec2-user",