From 9c6e3442797993b2abde6800dc945af5997a65aa Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Thu, 12 Oct 2023 11:19:50 +0200 Subject: [PATCH] Remove unnecessary version test for Slurm and PMIx The same checks are performed in Kitchen Tests we don't need to execute them again. Signed-off-by: Enrico Usai --- .../tests/schedulers/test_slurm.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tests/integration-tests/tests/schedulers/test_slurm.py b/tests/integration-tests/tests/schedulers/test_slurm.py index 0ff27a7be0..19e22ba8bb 100644 --- a/tests/integration-tests/tests/schedulers/test_slurm.py +++ b/tests/integration-tests/tests/schedulers/test_slurm.py @@ -96,7 +96,6 @@ def test_slurm( remote_command_executor = RemoteCommandExecutor(cluster, use_login_node=use_login_node) slurm_root_path = _retrieve_slurm_root_path(remote_command_executor) slurm_commands = scheduler_commands_factory(remote_command_executor) - _test_slurm_version(remote_command_executor) if supports_impi: _test_mpi_job_termination(remote_command_executor, test_datadir, slurm_commands, region, cluster) @@ -229,7 +228,6 @@ def test_slurm_pmix(pcluster_config_reader, scheduler, clusters_factory, use_log remote_command_executor = RemoteCommandExecutor(cluster, use_login_node=use_login_node) # Ensure the expected PMIx version is listed when running `srun --mpi=list`. - # Since we're installing PMIx v4.2.6, we expect to see pmix and pmix_v4 in the output. # Sample output: # [ec2-user@ip-172-31-33-187 ~]$ srun 2>&1 --mpi=list # srun: MPI types are... @@ -237,10 +235,12 @@ def test_slurm_pmix(pcluster_config_reader, scheduler, clusters_factory, use_log # srun: openmpi # srun: pmi2 # srun: pmix - # srun: pmix_v4 + # srun: pmix_vX + # + # _vX is the Major number of the PMIx version installed and used to compile slurm. + # We check this in the cookbook, so we do not repeat the check here mpi_list_output = remote_command_executor.run_remote_command("srun 2>&1 --mpi=list").stdout assert_that(mpi_list_output).matches(r"\s+pmix($|\s+)") - assert_that(mpi_list_output).matches(r"\s+pmix_v4($|\s+)") # Compile and run an MPI program interactively mpi_module = "openmpi" @@ -1708,12 +1708,6 @@ def _gpu_resource_check(slurm_commands, partition, instance_type, instance_type_ assert_that(job_info).contains(f"TresPerNode=gres:gpu:{gpus_per_instance}", f"CpusPerTres=gres:gpu:{cpus_per_gpu}") -def _test_slurm_version(remote_command_executor): - logging.info("Testing Slurm Version") - version = remote_command_executor.run_remote_command("sinfo -V").stdout - assert_that(version).is_equal_to("slurm 23.02.5") - - def _test_job_dependencies(slurm_commands, region, stack_name, scaledown_idletime): logging.info("Testing cluster doesn't scale when job dependencies are not satisfied") job_id = slurm_commands.submit_command_and_assert_job_accepted(