From 5501bc9e224e7bfbfd0509bc53b9227d7c02bcc6 Mon Sep 17 00:00:00 2001 From: Ryan Anderson Date: Tue, 30 Apr 2024 22:04:35 -0400 Subject: [PATCH] Test internal efs on arm and x86 --- tests/integration-tests/configs/develop.yaml | 2 +- .../integration-tests/tests/storage/test_internal_efs.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/integration-tests/configs/develop.yaml b/tests/integration-tests/configs/develop.yaml index 02174a2d2c..1d0f1d1bde 100644 --- a/tests/integration-tests/configs/develop.yaml +++ b/tests/integration-tests/configs/develop.yaml @@ -688,7 +688,7 @@ test-suites: test_internal_efs.py::test_internal_efs: dimensions: - regions: [ "us-west-2" ] - instances: {{ common.INSTANCES_DEFAULT_X86 }} + instances: {{ common.INSTANCES_DEFAULT }} oss: [ "ubuntu2204" ] schedulers: [ "slurm" ] test_shared_home.py::test_shared_home: diff --git a/tests/integration-tests/tests/storage/test_internal_efs.py b/tests/integration-tests/tests/storage/test_internal_efs.py index c3474f78c4..26b0491fc5 100644 --- a/tests/integration-tests/tests/storage/test_internal_efs.py +++ b/tests/integration-tests/tests/storage/test_internal_efs.py @@ -23,11 +23,14 @@ @pytest.mark.usefixtures("os", "scheduler", "instance") def test_internal_efs( - region, scheduler, pcluster_config_reader, clusters_factory, vpc_stack, scheduler_commands_factory + region, scheduler, pcluster_config_reader, architecture, clusters_factory, vpc_stack, scheduler_commands_factory ): """Verify the internal shared storage fs is available when set to Efs""" - compute_shared_dirs = ["/opt/parallelcluster/shared", "/opt/slurm", "/opt/intel", "/home"] - login_shared_dirs = ["/opt/parallelcluster/shared_login_nodes", "/opt/slurm", "/opt/intel", "/home"] + compute_shared_dirs = ["/opt/parallelcluster/shared", "/opt/slurm", "/home"] + login_shared_dirs = ["/opt/parallelcluster/shared_login_nodes", "/opt/slurm", "/home"] + if architecture == "x86_64": + compute_shared_dirs.append("/opt/intel") + login_shared_dirs.append("/opt/intel") cluster_config = pcluster_config_reader() cluster = clusters_factory(cluster_config) remote_command_executor = RemoteCommandExecutor(cluster)