Skip to content

Commit ce23768

Browse files
gmarcianihanwen-pcluste
authored andcommitted
Revert "Comment-out all FSxLustre storage tests"
This reverts commit 0e50f8d.
1 parent 5f7be37 commit ce23768

File tree

3 files changed

+52
-52
lines changed

3 files changed

+52
-52
lines changed

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -424,46 +424,46 @@ spot:
424424
schedulers: ["slurm"]
425425
storage:
426426
# Commercial regions that cant test FSx: ap-northeast-1, ap-southeast-1, ap-southeast-2, eu-central-1, eu-north-1, eu-west-1, eu-west-2, us-east-1, us-east-2, us-west-1, us-west-2
427-
# test_fsx_lustre.py::test_fsx_lustre:
428-
# dimensions:
429-
# - regions: ["eu-west-2"]
430-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
431-
# oss: {{ common.OSS_COMMERCIAL_X86 }}
432-
# schedulers: ["slurm"]
433-
# - regions: ["eu-north-1"]
434-
# instances: {{ common.INSTANCES_DEFAULT_ARM }}
435-
# oss: {{ common.OSS_COMMERCIAL_ARM }}
436-
# schedulers: ["slurm"]
437-
# - regions: ["cn-north-1"]
438-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
439-
# oss: ["alinux2"]
440-
# schedulers: ["slurm"]
441-
# - regions: ["us-gov-west-1"]
442-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
443-
# oss: ["alinux2"]
444-
# schedulers: ["slurm"]
445-
# test_fsx_lustre.py::test_fsx_lustre_configuration_options:
446-
# dimensions:
447-
# - regions: ["us-east-2"]
448-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
449-
# oss: ["alinux2"]
450-
# schedulers: ["slurm"]
451-
# test_fsx_lustre.py::test_fsx_lustre_backup:
452-
# dimensions:
453-
# - regions: ["eu-south-1"]
454-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
455-
# oss: {{ common.OSS_ONE_PER_DISTRO }}
456-
# schedulers: ["slurm"]
457-
# - regions: ["ap-southeast-1"]
458-
# instances: {{ common.INSTANCES_DEFAULT_ARM }}
459-
# oss: {{ common.OSS_COMMERCIAL_ARM }}
460-
# schedulers: ["slurm"]
461-
# test_fsx_lustre.py::test_existing_fsx:
462-
# dimensions:
463-
# - regions: ["us-west-2"]
464-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
465-
# oss: ["centos7"]
466-
# schedulers: ["slurm"]
427+
test_fsx_lustre.py::test_fsx_lustre:
428+
dimensions:
429+
- regions: ["eu-west-2"]
430+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
431+
oss: {{ common.OSS_COMMERCIAL_X86 }}
432+
schedulers: ["slurm"]
433+
- regions: ["eu-north-1"]
434+
instances: {{ common.INSTANCES_DEFAULT_ARM }}
435+
oss: {{ common.OSS_COMMERCIAL_ARM }}
436+
schedulers: ["slurm"]
437+
- regions: ["cn-north-1"]
438+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
439+
oss: ["alinux2"]
440+
schedulers: ["slurm"]
441+
- regions: ["us-gov-west-1"]
442+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
443+
oss: ["alinux2"]
444+
schedulers: ["slurm"]
445+
test_fsx_lustre.py::test_fsx_lustre_configuration_options:
446+
dimensions:
447+
- regions: ["us-east-2"]
448+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
449+
oss: ["alinux2"]
450+
schedulers: ["slurm"]
451+
test_fsx_lustre.py::test_fsx_lustre_backup:
452+
dimensions:
453+
- regions: ["eu-south-1"]
454+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
455+
oss: {{ common.OSS_ONE_PER_DISTRO }}
456+
schedulers: ["slurm"]
457+
- regions: ["ap-southeast-1"]
458+
instances: {{ common.INSTANCES_DEFAULT_ARM }}
459+
oss: {{ common.OSS_COMMERCIAL_ARM }}
460+
schedulers: ["slurm"]
461+
test_fsx_lustre.py::test_existing_fsx:
462+
dimensions:
463+
- regions: ["us-west-2"]
464+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
465+
oss: ["centos7"]
466+
schedulers: ["slurm"]
467467
# EFS tests can be done in any region.
468468
test_efs.py::test_efs_compute_az:
469469
dimensions:

tests/integration-tests/configs/new_region.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ test-suites:
130130
oss: ["centos7"]
131131
schedulers: ["slurm"]
132132
storage:
133-
# test_fsx_lustre.py::test_fsx_lustre:
134-
# dimensions:
135-
# - regions: {{ NEW_REGION }}
136-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
137-
# oss: ["alinux2"]
138-
# schedulers: ["slurm"]
133+
test_fsx_lustre.py::test_fsx_lustre:
134+
dimensions:
135+
- regions: {{ NEW_REGION }}
136+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
137+
oss: ["alinux2"]
138+
schedulers: ["slurm"]
139139
test_efs.py::test_efs_compute_az:
140140
dimensions:
141141
- regions: {{ NEW_REGION }}

tests/integration-tests/configs/pcluster3.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ test-suites:
7676
instances: {{ common.INSTANCES_DEFAULT_X86 }}
7777
oss: ["alinux2"]
7878
schedulers: ["awsbatch"]
79-
# test_fsx_lustre.py::test_existing_fsx:
80-
# dimensions:
81-
# - regions: ["us-west-2"]
82-
# instances: {{ common.INSTANCES_DEFAULT_X86 }}
83-
# oss: ["centos7"]
84-
# schedulers: ["slurm"]
79+
test_fsx_lustre.py::test_existing_fsx:
80+
dimensions:
81+
- regions: ["us-west-2"]
82+
instances: {{ common.INSTANCES_DEFAULT_X86 }}
83+
oss: ["centos7"]
84+
schedulers: ["slurm"]
8585
test_ebs.py::test_ebs_single:
8686
dimensions:
8787
- regions: ["eu-west-3"]

0 commit comments

Comments
 (0)