Skip to content

Commit 00d0017

Browse files
hanwen-clusterhanwen-pcluste
authored andcommitted
[Integ-tests] Don't check FSx in dynamic file system update test when FSx is not supported
The logic has been done in other checks of the same test. Signed-off-by: Hanwen <hanwenli@amazon.com>
1 parent e411da2 commit 00d0017

File tree

1 file changed

+40
-26
lines changed

1 file changed

+40
-26
lines changed

tests/integration-tests/tests/update/test_update.py

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,13 +1187,17 @@ def test_dynamic_file_systems_update(
11871187
scheduler_commands.assert_job_state(queue1_job_id, "RUNNING")
11881188

11891189
# Check that the mounted storage is visible on all cluster nodes right after the update.
1190-
all_mount_dirs_update_1 = [
1191-
existing_efs_mount_dir,
1192-
existing_fsx_lustre_mount_dir,
1193-
existing_fsx_ontap_mount_dir,
1194-
existing_fsx_open_zfs_mount_dir,
1195-
existing_file_cache_mount_dir,
1196-
]
1190+
all_mount_dirs_update_1 = (
1191+
[existing_efs_mount_dir]
1192+
+ [
1193+
existing_fsx_lustre_mount_dir,
1194+
existing_fsx_ontap_mount_dir,
1195+
existing_fsx_open_zfs_mount_dir,
1196+
existing_file_cache_mount_dir,
1197+
]
1198+
if fsx_supported
1199+
else []
1200+
)
11971201
_test_shared_storages_mount_on_headnode(
11981202
remote_command_executor,
11991203
cluster,
@@ -1353,26 +1357,36 @@ def test_dynamic_file_systems_update(
13531357
file_cache_path,
13541358
)
13551359

1356-
all_mount_dirs_update_2 = [
1357-
new_ebs_mount_dir,
1358-
new_raid_mount_dir,
1359-
new_efs_mount_dir,
1360-
new_lustre_mount_dir,
1361-
existing_ebs_mount_dir,
1362-
existing_efs_mount_dir,
1363-
existing_fsx_lustre_mount_dir,
1364-
existing_fsx_ontap_mount_dir,
1365-
existing_fsx_open_zfs_mount_dir,
1366-
existing_file_cache_mount_dir,
1367-
]
1360+
all_mount_dirs_update_2 = (
1361+
[
1362+
new_ebs_mount_dir,
1363+
new_raid_mount_dir,
1364+
new_efs_mount_dir,
1365+
new_lustre_mount_dir,
1366+
existing_ebs_mount_dir,
1367+
existing_efs_mount_dir,
1368+
]
1369+
+ [
1370+
existing_fsx_lustre_mount_dir,
1371+
existing_fsx_ontap_mount_dir,
1372+
existing_fsx_open_zfs_mount_dir,
1373+
existing_file_cache_mount_dir,
1374+
]
1375+
if fsx_supported
1376+
else []
1377+
)
13681378

1369-
mount_dirs_requiring_replacement = [
1370-
new_ebs_mount_dir,
1371-
new_raid_mount_dir,
1372-
new_efs_mount_dir,
1373-
new_lustre_mount_dir,
1374-
existing_ebs_mount_dir,
1375-
]
1379+
mount_dirs_requiring_replacement = (
1380+
[
1381+
new_ebs_mount_dir,
1382+
new_raid_mount_dir,
1383+
new_efs_mount_dir,
1384+
existing_ebs_mount_dir,
1385+
]
1386+
+ [new_lustre_mount_dir]
1387+
if fsx_supported
1388+
else []
1389+
)
13761390

13771391
logging.info("Checking that previously mounted storage is visible on all compute nodes")
13781392
for mount_dir in all_mount_dirs_update_1:

0 commit comments

Comments
 (0)