Use less powerful EFS and FSx in tests and example template

hanwen-cluster · hanwen-cluster · commit 40a160ab2336 · 2025-04-04T10:29:06.000-04:00
Our integration tests don't need the top performing configuratino

Signed-off-by: Hanwen &lt;hanwenli@amazon.com&gt;
diff --git a/cloudformation/storage/storage-stack.yaml b/cloudformation/storage/storage-stack.yaml
@@ -204,7 +204,7 @@ Resources:
         DeploymentType: PERSISTENT_1
         ExportPath: !Ref FsxLustreExportPath
         ImportPath: !Ref FsxLustreImportPath
-        PerUnitStorageThroughput: 200
+        PerUnitStorageThroughput: 50
       SecurityGroupIds:
         - !Ref FsxLustreSecurityGroup
       StorageCapacity: 1200
@@ -437,7 +437,7 @@ Resources:
                   SubnetIds=[subnet_id],
                   SecurityGroupIds=[securitygroup_id],
                   LustreConfiguration={
-                    "PerUnitStorageThroughput": 1000,
+                    "PerUnitStorageThroughput": 125,
                     "DeploymentType": "CACHE_1",
                     "MetadataConfiguration": {"StorageCapacity": 2400},
                   },
diff --git a/tests/integration-tests/resources/file-cache-storage-cfn.yaml b/tests/integration-tests/resources/file-cache-storage-cfn.yaml
@@ -87,7 +87,7 @@ Resources:
                   SubnetIds=[subnet_id],
                   SecurityGroupIds=[securitygroup_id],
                   LustreConfiguration={
-                    "PerUnitStorageThroughput": 1000,
+                    "PerUnitStorageThroughput": 125,
                     "DeploymentType": "CACHE_1",
                     "MetadataConfiguration": {"StorageCapacity": 2400},
                   },
diff --git a/tests/integration-tests/tests/networking/test_security_groups/test_overwrite_sg/pcluster.config.update.yaml b/tests/integration-tests/tests/networking/test_security_groups/test_overwrite_sg/pcluster.config.update.yaml
@@ -41,5 +41,5 @@ SharedStorage:
     FsxLustreSettings:
       StorageCapacity: 1200
       DeploymentType: PERSISTENT_1
-      PerUnitStorageThroughput: 200
+      PerUnitStorageThroughput: 50
   {% endif %}
diff --git a/tests/integration-tests/tests/networking/test_security_groups/test_overwrite_sg/pcluster.config.yaml b/tests/integration-tests/tests/networking/test_security_groups/test_overwrite_sg/pcluster.config.yaml
@@ -41,5 +41,5 @@ SharedStorage:
     FsxLustreSettings:
       StorageCapacity: 1200
       DeploymentType: PERSISTENT_1
-      PerUnitStorageThroughput: 200
+      PerUnitStorageThroughput: 50
   {% endif %}
diff --git a/tests/integration-tests/tests/storage/test_efs/test_multiple_efs/pcluster.config.yaml b/tests/integration-tests/tests/storage/test_efs/test_multiple_efs/pcluster.config.yaml
@@ -53,7 +53,7 @@ SharedStorage:
       Encrypted: true
       PerformanceMode: maxIO
       ThroughputMode: provisioned
-      ProvisionedThroughput: 200
+      ProvisionedThroughput: 20
   {% for efs_fs_id in existing_efs_ids %}
   - MountDir: {{ existing_efs_mount_dirs[loop.index-1] }}
     Name: existing_efs{{ loop.index-1 }}
diff --git a/tests/integration-tests/tests/storage/test_fsx_lustre.py b/tests/integration-tests/tests/storage/test_fsx_lustre.py
@@ -55,7 +55,7 @@
         "data_compression_type",
     ),
     [
-        ("PERSISTENT_1", 200, "NEW_CHANGED", None, None, 1200, 1024, None),
+        ("PERSISTENT_1", 50, "NEW_CHANGED", None, None, 1200, 1024, None),
         ("SCRATCH_1", None, "NEW", None, None, 1200, 1024, "LZ4"),
         ("SCRATCH_2", None, "NEW_CHANGED_DELETED", None, None, 1200, 1024, "LZ4"),
         ("PERSISTENT_1", 40, None, "HDD", None, 1800, 512, "LZ4"),
@@ -529,7 +529,7 @@ def _create_fsx_lustre_volume_ids(num_existing_fsx_lustre, fsx_factory, import_p
             ImportPath=import_path,
             ExportPath=export_path,
             DeploymentType="PERSISTENT_1",
-            PerUnitStorageThroughput=200,
+            PerUnitStorageThroughput=50,
         ),
         FileSystemTypeVersion="2.15",
     )
diff --git a/tests/integration-tests/tests/storage/test_fsx_lustre/test_fsx_lustre/pcluster.config.yaml b/tests/integration-tests/tests/storage/test_fsx_lustre/test_fsx_lustre/pcluster.config.yaml
@@ -44,4 +44,4 @@ SharedStorage:
       ImportPath: s3://{{ bucket_name }}
       ExportPath: s3://{{ bucket_name }}/export_dir
       DeploymentType: PERSISTENT_1
-      PerUnitStorageThroughput: 200
+      PerUnitStorageThroughput: 50
diff --git a/tests/integration-tests/tests/storage/test_fsx_lustre/test_fsx_lustre_backup/pcluster.config.yaml b/tests/integration-tests/tests/storage/test_fsx_lustre/test_fsx_lustre_backup/pcluster.config.yaml
@@ -35,7 +35,7 @@ SharedStorage:
       StorageCapacity: 1200
       WeeklyMaintenanceStartTime: "1:00:00"
       DeploymentType: PERSISTENT_1
-      PerUnitStorageThroughput: 200
+      PerUnitStorageThroughput: 50
       AutomaticBackupRetentionDays: 1
       DailyAutomaticBackupStartTime: "{{ daily_automatic_backup_start_time }}"
       CopyTagsToBackups: True
diff --git a/tests/integration-tests/tests/storage/test_fsx_lustre/test_fsx_lustre_dra/pcluster.config.update.yaml b/tests/integration-tests/tests/storage/test_fsx_lustre/test_fsx_lustre_dra/pcluster.config.update.yaml
@@ -35,7 +35,7 @@ SharedStorage:
     FsxLustreSettings:
       StorageCapacity: {{ storage_capacity }}
       DeploymentType: PERSISTENT_1
-      PerUnitStorageThroughput: 200
+      PerUnitStorageThroughput: 50
       DataRepositoryAssociations:
         - Name: dra
           BatchImportMetaDataOnCreate: True
diff --git a/tests/integration-tests/tests/storage/test_fsx_lustre/test_fsx_lustre_dra/pcluster.config.yaml b/tests/integration-tests/tests/storage/test_fsx_lustre/test_fsx_lustre_dra/pcluster.config.yaml
@@ -35,7 +35,7 @@ SharedStorage:
     FsxLustreSettings:
       StorageCapacity: {{ storage_capacity }}
       DeploymentType: PERSISTENT_1
-      PerUnitStorageThroughput: 200
+      PerUnitStorageThroughput: 50
       DataRepositoryAssociations:
         - Name: dra
           BatchImportMetaDataOnCreate: True
diff --git a/tests/integration-tests/tests/storage/test_fsx_lustre/test_multi_az_fsx/pcluster-managed-fsx.config.yaml b/tests/integration-tests/tests/storage/test_fsx_lustre/test_multi_az_fsx/pcluster-managed-fsx.config.yaml
@@ -49,4 +49,4 @@ SharedStorage:
       ImportPath: s3://{{ bucket_name }}
       ExportPath: s3://{{ bucket_name }}/export_dir
       DeploymentType: PERSISTENT_1
-      PerUnitStorageThroughput: 200
+      PerUnitStorageThroughput: 50
diff --git a/tests/integration-tests/tests/storage/test_fsx_lustre/test_multiple_fsx/pcluster.config.yaml b/tests/integration-tests/tests/storage/test_fsx_lustre/test_multiple_fsx/pcluster.config.yaml
@@ -43,7 +43,7 @@ SharedStorage:
       ImportPath: s3://{{ bucket_name }}
       ExportPath: s3://{{ bucket_name }}/export_dir
       DeploymentType: PERSISTENT_1
-      PerUnitStorageThroughput: 200
+      PerUnitStorageThroughput: 50
   {% for fsx_fs_id in existing_fsx_lustre_fs_ids %}
   - MountDir: {{ fsx_lustre_mount_dirs[loop.index] }} # the index of mount dirs starts from the second item. Because the first is used for the new FSx.
     Name: existingfsx{{ loop.index-1 }}
diff --git a/tests/integration-tests/tests/update/test_update/test_dynamic_file_systems_update/pcluster.config.update.yaml b/tests/integration-tests/tests/update/test_update/test_dynamic_file_systems_update/pcluster.config.update.yaml
@@ -91,7 +91,7 @@ SharedStorage:
       Encrypted: true
       PerformanceMode: maxIO
       ThroughputMode: provisioned
-      ProvisionedThroughput: 200
+      ProvisionedThroughput: 20
       DeletionPolicy: {{ new_efs_deletion_policy }}
 {% endif %}
 {% if existing_efs_mount_dir %}
@@ -110,7 +110,7 @@ SharedStorage:
       ImportPath: s3://{{ bucket_name }}
       ExportPath: s3://{{ bucket_name }}/export_dir
       DeploymentType: PERSISTENT_1
-      PerUnitStorageThroughput: 200
+      PerUnitStorageThroughput: 50
       DeletionPolicy: {{ new_lustre_deletion_policy }}
 {% endif %}
 {% if fsx_lustre_mount_dir %}
diff --git a/tests/integration-tests/tests/update/test_update/test_dynamic_file_systems_update_rollback/pcluster.config.update_rollback.yaml b/tests/integration-tests/tests/update/test_update/test_dynamic_file_systems_update_rollback/pcluster.config.update_rollback.yaml
@@ -77,7 +77,7 @@ SharedStorage:
       Encrypted: true
       PerformanceMode: maxIO
       ThroughputMode: provisioned
-      ProvisionedThroughput: 200
+      ProvisionedThroughput: 20
   {% if new_lustre_mount_dir %}
   - MountDir: {{ new_lustre_mount_dir }}
     Name: {{ new_lustre_mount_dir }}
@@ -87,5 +87,5 @@ SharedStorage:
       ImportPath: s3://{{ bucket_name }}
       ExportPath: s3://{{ bucket_name }}/export_dir
       DeploymentType: PERSISTENT_1
-      PerUnitStorageThroughput: 200
+      PerUnitStorageThroughput: 50
   {% endif %}
diff --git a/tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.update.yaml b/tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.update.yaml
@@ -165,7 +165,7 @@ SharedStorage:
     StorageType: Efs
     EfsSettings: # New section
       ThroughputMode: provisioned
-      ProvisionedThroughput: 1024
+      ProvisionedThroughput: 20
 {% if "us-isob" not in region %}
   - MountDir: fsx
     Name: fsx
