[AL2023] Fix unit tests

Signed-off-by: Hanwen <[email protected]>
aws · Jun 12, 2024 · 7faf80a · 7faf80a
1 parent 4e7c235
commit 7faf80a
Show file tree

Hide file tree

Showing 15 changed files with 125 additions and 102 deletions.
diff --git a/...ter/cli/configure/test_pcluster_configure/test_disabled_efa_no_placement_group/output.txt b/...ter/cli/configure/test_pcluster_configure/test_disabled_efa_no_placement_group/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+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
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
  # id name number_of_subnets
 --- ------------ --------------------------------- -------------------

diff --git a/...cli/configure/test_pcluster_configure/test_enabled_efa_default_placement_group/output.txt b/...cli/configure/test_pcluster_configure/test_enabled_efa_default_placement_group/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+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/...li/configure/test_pcluster_configure/test_enabled_efa_existing_placement_group/output.txt b/...li/configure/test_pcluster_configure/test_enabled_efa_existing_placement_group/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+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/...onfigure/test_pcluster_configure/test_enabled_efa_non_existent_placement_group/output.txt b/...onfigure/test_pcluster_configure/test_enabled_efa_non_existent_placement_group/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+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/...sts/pcluster/cli/configure/test_pcluster_configure/test_filtered_subnets_by_az/output.txt b/...sts/pcluster/cli/configure/test_pcluster_configure/test_filtered_subnets_by_az/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
  # id name number_of_subnets
 --- ------------ --------------------------------- -------------------

diff --git a/...cli/configure/test_pcluster_configure/test_no_automation_no_awsbatch_no_errors/output.txt b/...cli/configure/test_pcluster_configure/test_no_automation_no_awsbatch_no_errors/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
  # id name number_of_subnets
 --- ------------ --------------------------------- -------------------

diff --git a/...er/cli/configure/test_pcluster_configure/test_no_input_no_automation_no_errors/output.txt b/...er/cli/configure/test_pcluster_configure/test_no_input_no_automation_no_errors/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
  # id name number_of_subnets
 --- ------------ --------------------------------- -------------------

diff --git a/...configure/test_pcluster_configure/test_subnet_automation_no_awsbatch_no_errors/output.txt b/...configure/test_pcluster_configure/test_subnet_automation_no_awsbatch_no_errors/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
  # id name number_of_subnets
 --- ------------ --------------------------------- -------------------

diff --git a/...test_pcluster_configure/test_subnet_automation_no_awsbatch_no_errors_empty_vpc/output.txt b/...test_pcluster_configure/test_subnet_automation_no_awsbatch_no_errors_empty_vpc/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
  # id name number_of_subnets
 --- ------------ --------------------------------- -------------------

diff --git a/...li/configure/test_pcluster_configure/test_vpc_automation_no_awsbatch_no_errors/output.txt b/...li/configure/test_pcluster_configure/test_vpc_automation_no_awsbatch_no_errors/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for Availability Zone:
 1. eu-west-1a
 2. eu-west-1b

diff --git a/...ter/cli/configure/test_pcluster_configure/test_vpc_automation_no_vpc_in_region/output.txt b/...ter/cli/configure/test_pcluster_configure/test_vpc_automation_no_vpc_in_region/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+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/.../configure/test_pcluster_configure/test_vpc_automation_no_vpc_in_region_public/output.txt b/.../configure/test_pcluster_configure/test_vpc_automation_no_vpc_in_region_public/output.txt
@@ -31,13 +31,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+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
@@ -14,13 +14,14 @@ Allowed values for Scheduler:
 2. awsbatch
 Allowed values for Operating System:
 1. alinux2
-2. centos7
-3. ubuntu2004
-4. ubuntu2204
-5. rhel8
-6. rocky8
-7. rhel9
-8. rocky9
+2. alinux2023
+3. centos7
+4. ubuntu2004
+5. ubuntu2204
+6. rhel8
+7. rocky8
+8. rhel9
+9. rocky9
 Allowed values for VPC ID:
  # id name number_of_subnets
 --- ------------ --------------------------------- -------------------

diff --git a/cli/tests/pcluster/test_utils.py b/cli/tests/pcluster/test_utils.py
@@ -86,8 +86,14 @@ def test_generate_random_prefix():
 @pytest.mark.parametrize(
  "architecture, supported_oses",
  [
- ("x86_64", ["alinux2", "centos7", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"]),
- ("arm64", ["alinux2", "centos7", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"]),
+ (
+ "x86_64",
+ ["alinux2", "alinux2023", "centos7", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"],
+ ),
+ (
+ "arm64",
+ ["alinux2", "alinux2023", "centos7", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"],
+ ),
  ],
 )
 def test_get_supported_os_for_architecture(architecture, supported_oses):
@@ -100,8 +106,11 @@ def test_get_supported_os_for_architecture(architecture, supported_oses):
 @pytest.mark.parametrize(
  "scheduler, supported_oses",
  [
- ("slurm", ["alinux2", "centos7", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"]),
- ("awsbatch", ["alinux2"]),
+ (
+ "slurm",
+ ["alinux2", "alinux2023", "centos7", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"],
+ ),
+ ("awsbatch", ["alinux2", "alinux2023"]),
  ],
 )
 def test_get_supported_os_for_scheduler(scheduler, supported_oses):