Skip to content

Commit a3858c8

Browse files
gmarcianihanwen-pcluste
authored andcommitted
Revert "Comment-out all the test case which use FSxLustre"
This reverts commit 6fbc6c0.
1 parent ce23768 commit a3858c8

File tree

3 files changed

+59
-59
lines changed

3 files changed

+59
-59
lines changed

tests/integration-tests/configs/common/common.yaml

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -275,12 +275,12 @@ intel_hpc:
275275
oss: ["centos7"]
276276
schedulers: ["slurm"]
277277
networking:
278-
# test_cluster_networking.py::test_cluster_in_private_subnet:
279-
# dimensions:
280-
# - regions: ["me-south-1"]
281-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
282-
# oss: ["alinux2", "centos7"]
283-
# schedulers: ["slurm"]
278+
test_cluster_networking.py::test_cluster_in_private_subnet:
279+
dimensions:
280+
- regions: ["me-south-1"]
281+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
282+
oss: ["alinux2", "centos7"]
283+
schedulers: ["slurm"]
284284
test_cluster_networking.py::test_existing_eip:
285285
dimensions:
286286
- regions: ["me-south-1"]
@@ -293,26 +293,26 @@ networking:
293293
test_networking.py::test_public_private_network_topology:
294294
dimensions:
295295
- regions: ["af-south-1", "us-gov-east-1", "cn-northwest-1"]
296-
# test_cluster_networking.py::test_cluster_in_no_internet_subnet:
297-
# dimensions:
298-
# # The region needs to be the same of the Jenkins server since default pre/post install scripts are hosted in an
299-
# # S3 bucket belonging to the same region and S3 VPC Endpoints only work within the region.
300-
# - regions: ["us-east-1"]
301-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
302-
# oss: {{ common.OSS_COMMERCIAL_X86 }}
303-
# schedulers: ["slurm"]
304-
# - regions: ["us-east-1"]
305-
# instances: {{ common.INSTANCES_DEFAULT_ARM }}
306-
# oss: {{ common.OSS_COMMERCIAL_ARM }}
307-
# schedulers: ["slurm"]
308-
# - regions: ["cn-north-1"]
309-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
310-
# oss: ["alinux2"]
311-
# schedulers: ["slurm"]
312-
# - regions: ["us-gov-west-1"]
313-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
314-
# oss: ["ubuntu2004"]
315-
# schedulers: ["slurm"]
296+
test_cluster_networking.py::test_cluster_in_no_internet_subnet:
297+
dimensions:
298+
# The region needs to be the same of the Jenkins server since default pre/post install scripts are hosted in an
299+
# S3 bucket belonging to the same region and S3 VPC Endpoints only work within the region.
300+
- regions: ["us-east-1"]
301+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
302+
oss: {{ common.OSS_COMMERCIAL_X86 }}
303+
schedulers: ["slurm"]
304+
- regions: ["us-east-1"]
305+
instances: {{ common.INSTANCES_DEFAULT_ARM }}
306+
oss: {{ common.OSS_COMMERCIAL_ARM }}
307+
schedulers: ["slurm"]
308+
- regions: ["cn-north-1"]
309+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
310+
oss: ["alinux2"]
311+
schedulers: ["slurm"]
312+
- regions: ["us-gov-west-1"]
313+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
314+
oss: ["ubuntu2004"]
315+
schedulers: ["slurm"]
316316
test_multi_cidr.py::test_multi_cidr:
317317
dimensions:
318318
- regions: ["ap-northeast-2"]
@@ -329,16 +329,16 @@ networking:
329329
instances: {{ common.INSTANCES_DEFAULT_X86 }}
330330
oss: ["alinux2"]
331331
schedulers: ["awsbatch"]
332-
# test_security_groups.py::test_overwrite_sg:
333-
# dimensions:
334-
# - regions: ["eu-north-1"]
335-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
336-
# oss: ["centos7"]
337-
# schedulers: ["slurm"]
338-
# - regions: ["eu-north-1"]
339-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
340-
# oss: ["alinux2"]
341-
# schedulers: ["awsbatch"]
332+
test_security_groups.py::test_overwrite_sg:
333+
dimensions:
334+
- regions: ["eu-north-1"]
335+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
336+
oss: ["centos7"]
337+
schedulers: ["slurm"]
338+
- regions: ["eu-north-1"]
339+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
340+
oss: ["alinux2"]
341+
schedulers: ["awsbatch"]
342342
test_placement_group.py::test_placement_group:
343343
dimensions:
344344
- regions: ["eu-central-1"]
@@ -575,11 +575,11 @@ update:
575575
- regions: ["eu-south-1"]
576576
instances: {{ common.INSTANCES_DEFAULT_X86 }}
577577
oss: ["alinux2"]
578-
# test_update.py::test_update_slurm:
579-
# dimensions:
580-
# - regions: ["eu-west-1"]
581-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
582-
# oss: {{ common.OSS_COMMERCIAL_X86 }}
578+
test_update.py::test_update_slurm:
579+
dimensions:
580+
- regions: ["eu-west-1"]
581+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
582+
oss: {{ common.OSS_COMMERCIAL_X86 }}
583583
test_update.py::test_update_compute_ami:
584584
dimensions:
585585
- regions: ["eu-west-1"]

tests/integration-tests/configs/new_region.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ test-suites:
5555
instances: {{ common.INSTANCES_DEFAULT_X86 }}
5656
oss: ["ubuntu1804"]
5757
schedulers: ["slurm"]
58-
# update:
59-
# test_update.py::test_update_slurm:
60-
# dimensions:
61-
# - regions: {{ NEW_REGION }}
62-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
63-
# oss: ["alinux2"]
64-
# schedulers: ["slurm"]
58+
update:
59+
test_update.py::test_update_slurm:
60+
dimensions:
61+
- regions: {{ NEW_REGION }}
62+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
63+
oss: ["alinux2"]
64+
schedulers: ["slurm"]
6565
dashboard:
6666
test_dashboard.py::test_dashboard:
6767
dimensions:
@@ -104,12 +104,12 @@ test-suites:
104104
oss: ["alinux2"]
105105
schedulers: ["slurm"]
106106
networking:
107-
# test_cluster_networking.py::test_cluster_in_private_subnet:
108-
# dimensions:
109-
# - regions: {{ NEW_REGION }}
110-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
111-
# oss: ["ubuntu1804"]
112-
# schedulers: ["slurm"]
107+
test_cluster_networking.py::test_cluster_in_private_subnet:
108+
dimensions:
109+
- regions: {{ NEW_REGION }}
110+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
111+
oss: ["ubuntu1804"]
112+
schedulers: ["slurm"]
113113
test_networking.py::test_public_network_topology:
114114
dimensions:
115115
- regions: {{ NEW_REGION }}

tests/integration-tests/configs/pcluster3.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ test-suites:
101101
- regions: ["eu-south-1"]
102102
instances: {{ common.INSTANCES_DEFAULT_X86 }}
103103
oss: ["alinux2"]
104-
# test_update.py::test_update_slurm:
105-
# dimensions:
106-
# - regions: ["eu-west-1"]
107-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
108-
# oss: ["centos7"]
104+
test_update.py::test_update_slurm:
105+
dimensions:
106+
- regions: ["eu-west-1"]
107+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
108+
oss: ["centos7"]

0 commit comments

Comments
 (0)