Skip to content

Commit

Permalink
[AL2023] Adding Al2023 for daily and released Integration tests (#6295)
Browse files Browse the repository at this point in the history
Co-authored-by: Himani Deshpande <[email protected]>
  • Loading branch information
himani2411 and Himani Deshpande authored Jun 18, 2024
1 parent 816f68d commit aee3210
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
14 changes: 7 additions & 7 deletions tests/integration-tests/configs/common.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
{%- set SCHEDULERS_ALL = ["slurm", "awsbatch"] -%}
{%- set SCHEDULERS_TRAD = ["slurm"] -%}
{%- set OSS_BATCH = ["alinux2"] -%}
{%- set OSS_COMMERCIAL_X86 = ["alinux2", "centos7", "ubuntu2004", "ubuntu2204", "rhel8", "rhel9"] -%}
{%- set OSS_CHINA_X86 = ["alinux2", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"] -%}
{%- set OSS_GOVCLOUD_X86 = ["alinux2", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"] -%}
{%- set OSS_COMMERCIAL_ARM = ["alinux2", "ubuntu2004", "ubuntu2204", "rhel8", "rhel9"] -%}
{%- set OSS_CHINA_ARM = ["alinux2", "ubuntu2004", "ubuntu2204", "rhel8", "rhel9"] -%}
{%- set OSS_GOVCLOUD_ARM = ["alinux2", "ubuntu2004", "ubuntu2204", "rhel8", "rhel9"] -%}
{%- set OSS_ONE_PER_DISTRO = ["centos7", "alinux2", "ubuntu2004", "rhel8", "rocky8"] -%}
{%- set OSS_COMMERCIAL_X86 = ["alinux2", "alinux2023", "centos7", "ubuntu2004", "ubuntu2204", "rhel8", "rhel9"] -%}
{%- set OSS_CHINA_X86 = ["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"] -%}
{%- set OSS_GOVCLOUD_X86 = ["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"] -%}
{%- set OSS_COMMERCIAL_ARM = ["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "rhel8", "rhel9"] -%}
{%- set OSS_CHINA_ARM = ["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "rhel8", "rhel9"] -%}
{%- set OSS_GOVCLOUD_ARM = ["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "rhel8", "rhel9"] -%}
{%- set OSS_ONE_PER_DISTRO = ["centos7", "alinux2", "alinux2023", "ubuntu2004", "rhel8", "rocky8"] -%}
{%- set INSTANCES_DEFAULT_X86 = ["c5.xlarge"] -%}
{%- set INSTANCES_DEFAULT_ARM = ["m6g.xlarge"] -%} # m6g.xlarge is not supported in af-south-1, eu-south-1, eu-west-3, me-south-1
{%- set INSTANCES_DEFAULT = ["c5.xlarge", "m6g.xlarge"] -%}
Expand Down
26 changes: 13 additions & 13 deletions tests/integration-tests/configs/develop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ test-suites:
test_on_demand_capacity_reservation.py::test_on_demand_capacity_reservation:
dimensions:
- regions: ["us-west-2"]
oss: ["alinux2"]
oss: ["alinux2023"]
test_capacity_blocks.py::test_capacity_blocks:
dimensions:
- regions: ["eu-west-1"]
Expand All @@ -45,7 +45,7 @@ test-suites:
# 1) run the test for all the schedulers with alinux2
- regions: ["cn-northwest-1"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: {{ common.SCHEDULERS_TRAD }}
- regions: ["us-gov-east-1"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
Expand Down Expand Up @@ -98,7 +98,7 @@ test-suites:
dimensions:
- regions: ["us-west-2"]
instances: {{ common.INSTANCES_EFA_SUPPORTED_X86 }}
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: ["slurm"]
test_pcluster_configure.py::test_efa_unsupported:
dimensions:
Expand Down Expand Up @@ -194,7 +194,7 @@ test-suites:
instances: {{ common.INSTANCES_DEFAULT_X86 }}
test_cluster_custom_resource.py::test_cluster_update_invalid:
dimensions:
- oss: ["alinux2"]
- oss: ["alinux2023"]
regions: ["us-east-2"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
test_cluster_custom_resource.py::test_cluster_update_tag_propagation:
Expand Down Expand Up @@ -257,7 +257,7 @@ test-suites:
dimensions:
- regions: ["eu-south-1"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: ["slurm"]
efa:
test_efa.py::test_efa:
Expand Down Expand Up @@ -300,7 +300,7 @@ test-suites:
dimensions:
- regions: ["eu-west-3"]
schedulers: ["awsbatch", "slurm"]
oss: ["alinux2"]
oss: ["alinux2023"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
test_iam_image.py::test_iam_roles:
dimensions:
Expand Down Expand Up @@ -379,7 +379,7 @@ test-suites:
dimensions:
- regions: ["ap-northeast-2"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: ["slurm"]
test_security_groups.py::test_additional_sg_and_ssh_from:
dimensions:
Expand Down Expand Up @@ -443,7 +443,7 @@ test-suites:
dimensions:
- regions: ["use2-az2"] # do not move, unless instance type support is moved as well
instances: [{{ common.instance("instance_type_1") }}]
oss: [ "alinux2" ]
oss: [ "alinux2023" ]
schedulers: [ "slurm" ]
test_slurm.py::test_error_handling:
dimensions:
Expand Down Expand Up @@ -509,7 +509,7 @@ test-suites:
dimensions:
- regions: [ "ap-south-1" ]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: ["slurm"]
test_slurm.py::test_slurm_custom_partitions:
dimensions:
Expand Down Expand Up @@ -593,7 +593,7 @@ test-suites:
dimensions:
- regions: ["us-east-2"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: ["slurm"]
test_fsx_lustre.py::test_fsx_lustre_backup:
dimensions:
Expand Down Expand Up @@ -701,7 +701,7 @@ test-suites:
dimensions:
- regions: [ "us-west-1" ]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
oss: [ "alinux2" ]
oss: [ "alinux2023" ]
schedulers: [ "slurm" ]
pcluster_api:
test_api_infrastructure.py::test_api_infrastructure_with_default_parameters:
Expand All @@ -725,7 +725,7 @@ test-suites:
dimensions:
- regions: ["sa-east-1"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: ["slurm"]
resource_bucket:
test_resource_bucket.py::test_resource_bucket:
Expand All @@ -746,7 +746,7 @@ test-suites:
dimensions:
- regions: ["usw2-az4"] # do not move, unless instance type support is moved as well
schedulers: ["slurm"]
oss: ["ubuntu2004"]
oss: ["alinux2023"]
update:
test_update.py::test_update_slurm:
dimensions:
Expand Down
8 changes: 4 additions & 4 deletions tests/integration-tests/configs/released.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ test-suites:
dimensions:
- regions: ["ap-east-1"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: ["slurm"]
test_compute_console_output_logging.py::test_custom_action_error:
dimensions:
Expand Down Expand Up @@ -125,7 +125,7 @@ test-suites:
dimensions:
- regions: ["eu-south-1"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: ["slurm"]
efa:
test_efa.py::test_efa:
Expand All @@ -152,7 +152,7 @@ test-suites:
dimensions:
- regions: ["ap-northeast-2"]
instances: {{ common.INSTANCES_DEFAULT_X86 }}
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: ["slurm"]
test_security_groups.py::test_overwrite_sg:
dimensions:
Expand Down Expand Up @@ -276,7 +276,7 @@ test-suites:
dimensions:
- regions: ["use1-az4"]
instances: ["m5d.xlarge"] # SSD based instance
oss: ["alinux2"]
oss: ["alinux2023"]
schedulers: ["slurm"]
tags:
test_tag_propagation.py::test_tag_propagation:
Expand Down

0 comments on commit aee3210

Please sign in to comment.