Add support for ubuntu24 in unit tests

hgreebe · hgreebe · commit 69bc04ea9aab · 2025-02-25T17:42:08.000-05:00
diff --git a/cli/src/pcluster/config/cluster_config.py b/cli/src/pcluster/config/cluster_config.py
@@ -32,7 +32,9 @@
     DefaultUserHomeType,
 )
 from pcluster.config.common import Imds as TopLevelImds
-from pcluster.config.common import Resource
+from pcluster.config.common import (
+    Resource,
+)
 from pcluster.constants import (
     CIDR_ALL_IPS,
     CW_ALARMS_ENABLED_DEFAULT,
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_disabled_efa_no_placement_group/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_disabled_efa_no_placement_group/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 The EC2 instance selected supports enhanced networking capabilities using Elastic Fabric Adapter (EFA). EFA enables you to run applications requiring high levels of inter-node communications at scale on AWS at no additional charge (https://docs.aws.amazon.com/parallelcluster/latest/ug/efa-v3.html).
 Allowed values for VPC ID:
   #  id            name                                 number_of_subnets
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_efa_not_supported/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_efa_not_supported/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
   #  id            name                                 number_of_subnets
 ---  ------------  ---------------------------------  -------------------
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_enabled_efa_default_placement_group/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_enabled_efa_default_placement_group/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 The EC2 instance selected supports enhanced networking capabilities using Elastic Fabric Adapter (EFA). EFA enables you to run applications requiring high levels of inter-node communications at scale on AWS at no additional charge (https://docs.aws.amazon.com/parallelcluster/latest/ug/efa-v3.html).
 Enabling EFA requires compute instances to be placed within a Placement Group. Please specify an existing Placement Group name or leave it blank for ParallelCluster to create one.
 Allowed values for VPC ID:
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_enabled_efa_existing_placement_group/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_enabled_efa_existing_placement_group/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 The EC2 instance selected supports enhanced networking capabilities using Elastic Fabric Adapter (EFA). EFA enables you to run applications requiring high levels of inter-node communications at scale on AWS at no additional charge (https://docs.aws.amazon.com/parallelcluster/latest/ug/efa-v3.html).
 Enabling EFA requires compute instances to be placed within a Placement Group. Please specify an existing Placement Group name or leave it blank for ParallelCluster to create one.
 Allowed values for VPC ID:
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_enabled_efa_non_existent_placement_group/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_enabled_efa_non_existent_placement_group/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 The EC2 instance selected supports enhanced networking capabilities using Elastic Fabric Adapter (EFA). EFA enables you to run applications requiring high levels of inter-node communications at scale on AWS at no additional charge (https://docs.aws.amazon.com/parallelcluster/latest/ug/efa-v3.html).
 Enabling EFA requires compute instances to be placed within a Placement Group. Please specify an existing Placement Group name or leave it blank for ParallelCluster to create one.
 ERROR: non-existent-test-pg is not an acceptable value for Placement Group name
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_filtered_subnets_by_az/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_filtered_subnets_by_az/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
   #  id            name                                 number_of_subnets
 ---  ------------  ---------------------------------  -------------------
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_no_automation_no_awsbatch_no_errors/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_no_automation_no_awsbatch_no_errors/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
   #  id            name                                 number_of_subnets
 ---  ------------  ---------------------------------  -------------------
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_no_input_no_automation_no_errors/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_no_input_no_automation_no_errors/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
   #  id            name                                 number_of_subnets
 ---  ------------  ---------------------------------  -------------------
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_subnet_automation_no_awsbatch_no_errors/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_subnet_automation_no_awsbatch_no_errors/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
   #  id            name                                 number_of_subnets
 ---  ------------  ---------------------------------  -------------------
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_subnet_automation_no_awsbatch_no_errors_empty_vpc/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_subnet_automation_no_awsbatch_no_errors_empty_vpc/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
   #  id            name                                 number_of_subnets
 ---  ------------  ---------------------------------  -------------------
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_vpc_automation_no_awsbatch_no_errors/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_vpc_automation_no_awsbatch_no_errors/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for Availability Zone:
 1. eu-west-1a
 2. eu-west-1b
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_vpc_automation_no_vpc_in_region/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_vpc_automation_no_vpc_in_region/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 There are no VPC for the given region. Starting automatic creation of VPC and subnets...
 Allowed values for Availability Zone:
 1. eu-west-1a
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_vpc_automation_no_vpc_in_region_public/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_vpc_automation_no_vpc_in_region_public/output.txt
@@ -34,10 +34,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 There are no VPC for the given region. Starting automatic creation of VPC and subnets...
 Allowed values for Availability Zone:
 1. eu-west-1a
diff --git a/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_with_region_arg/output.txt b/cli/tests/pcluster/cli/configure/test_pcluster_configure/test_with_region_arg/output.txt
@@ -17,10 +17,11 @@ Allowed values for Operating System:
 2. alinux2023
 3. ubuntu2004
 4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+5. ubuntu2404
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
   #  id            name                                 number_of_subnets
 ---  ------------  ---------------------------------  -------------------
