Skip to content

Commit 440eea9

Browse files
authored
[develop] Remove KUL region support and change related integ-test (#6766)
1 parent a7629ae commit 440eea9

File tree

6 files changed

+6
-8
lines changed

6 files changed

+6
-8
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ CHANGELOG
1111
**ENHANCEMENTS**
1212
- Add support for Ubuntu 24.04.
1313
Notice that ParallelCluster official AMI for Ubuntu 24.04 does not support Lustre.
14-
- Add support for ap-southeast-5 region.
1514
- Disable unused services cups and wpa_supplicant from Official ParallelCluster AMIs to improve security.
1615

1716
**CHANGES**

cli/src/pcluster/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ class Feature(Enum):
278278

279279

280280
UNSUPPORTED_FEATURES_MAP = {
281-
Feature.BATCH: ["ap-northeast-3", "ap-southeast-5", "ap-southeast-7", "us-iso"],
281+
Feature.BATCH: ["ap-northeast-3", "ap-southeast-7", "us-iso"],
282282
Feature.DCV: ["us-iso"],
283283
Feature.FSX_LUSTRE: ["us-isob"],
284284
Feature.FILE_CACHE: ["us-iso"],

cli/src/pcluster/resources/supported-regions

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ap-south-1
66
ap-southeast-1
77
ap-southeast-2
88
ap-southeast-3
9-
ap-southeast-5
109
ap-southeast-7
1110
ca-central-1
1211
cn-north-1

tests/integration-tests/configs/common.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{%- set REGIONS_COMMERCIAL = ["us-east-1", "us-east-2", "us-west-1", "us-west-2", "ca-central-1", "eu-central-1", "eu-west-1", "eu-west-2", "eu-west-3", "sa-east-1", "ap-east-1", "ap-northeast-1", "ap-northeast-2", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ap-southeast-3", "ap-southeast-5", "ap-southeast-7", "eu-north-1", "me-south-1", "af-south-1", "eu-south-1", "il-central-1"] -%}
1+
{%- set REGIONS_COMMERCIAL = ["us-east-1", "us-east-2", "us-west-1", "us-west-2", "ca-central-1", "eu-central-1", "eu-west-1", "eu-west-2", "eu-west-3", "sa-east-1", "ap-east-1", "ap-northeast-1", "ap-northeast-2", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ap-southeast-3", "ap-southeast-7", "eu-north-1", "me-south-1", "af-south-1", "eu-south-1", "il-central-1"] -%}
22
{%- set REGIONS_CHINA = ["cn-north-1", "cn-northwest-1"] -%}
33
{%- set REGIONS_GOVCLOUD = ["us-gov-west-1", "us-gov-east-1"] -%}
44
{%- set REGIONS_ALL = REGIONS_COMMERCIAL + REGIONS_CHINA + REGIONS_GOVCLOUD -%}

tests/integration-tests/configs/develop.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ test-suites:
7676
configure:
7777
test_pcluster_configure.py::test_pcluster_configure:
7878
dimensions:
79-
- regions: ["ap-southeast-5"]
79+
- regions: ["ap-southeast-2"]
8080
instances: {{ common.INSTANCES_DEFAULT_ARM }}
8181
oss: [{{ OS_ARM_2 }}]
8282
schedulers: ["slurm"]
@@ -815,8 +815,8 @@ test-suites:
815815
proxy:
816816
test_proxy.py::test_proxy:
817817
dimensions:
818-
- regions: ["ap-southeast-5"] # c5 instance type is not available in ap-southeast-5
819-
instances: ["m6i.xlarge"]
818+
- regions: ["eu-central-1"]
819+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
820820
oss: [{{ OS_X86_7 }}]
821821
schedulers: ["slurm"]
822822
pyxis:

tests/integration-tests/configs/released.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ test-suites:
5050
configure:
5151
test_pcluster_configure.py::test_pcluster_configure:
5252
dimensions:
53-
- regions: ["ap-southeast-5"]
53+
- regions: ["ap-southeast-2"]
5454
instances: {{ common.INSTANCES_DEFAULT_ARM }}
5555
oss: ["alinux2"]
5656
schedulers: ["slurm"]

0 commit comments

Comments
 (0)