From 2c1546b598d2dbcbcd37e57b6c3857000d698b53 Mon Sep 17 00:00:00 2001 From: Eirini Koutsaniti Date: Thu, 2 May 2024 09:33:17 +0200 Subject: [PATCH 1/2] Set _nodespec in squeue scheduler --- reframe/core/schedulers/slurm.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reframe/core/schedulers/slurm.py b/reframe/core/schedulers/slurm.py index 550f0d3a8a..6ace44c878 100644 --- a/reframe/core/schedulers/slurm.py +++ b/reframe/core/schedulers/slurm.py @@ -621,6 +621,8 @@ def poll(self, *jobs): # Join the states with ',' in case of job arrays job._state = ','.join(s.group('state') for s in job_match) + # Use ',' to join nodes to be consistent with Slurm syntax + job._nodespec = ','.join(m.group('nodespec') for m in job_match) self._cancel_if_blocked( job, [s.group('reason') for s in state_match] ) From ff41341e833f0ef4ab776debc66211f224c7db80 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Wed, 8 May 2024 23:05:47 +0200 Subject: [PATCH 2/2] Update ReFrame Dockerfile in Docker compose setup So as to be able to test more easily branches from different forks --- examples/tutorial/dockerfiles/slurm-cluster/reframe/Dockerfile | 3 ++- reframe/core/schedulers/slurm.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/tutorial/dockerfiles/slurm-cluster/reframe/Dockerfile b/examples/tutorial/dockerfiles/slurm-cluster/reframe/Dockerfile index d563235ed4..b152b50cd4 100644 --- a/examples/tutorial/dockerfiles/slurm-cluster/reframe/Dockerfile +++ b/examples/tutorial/dockerfiles/slurm-cluster/reframe/Dockerfile @@ -35,8 +35,9 @@ RUN chmod +rx /etc/slurm-llnl/docker-entrypoint.sh # Install reframe ARG REFRAME_TAG=develop +ARG REFRAME_REPO=reframe-hpc WORKDIR /usr/local/share -RUN git clone --depth 1 --branch $REFRAME_TAG https://github.com/reframe-hpc/reframe.git && \ +RUN git clone --depth 1 --branch $REFRAME_TAG https://github.com/$REFRAME_REPO/reframe.git && \ cd reframe/ && ./bootstrap.sh ENV PATH=/usr/local/share/reframe/bin:$PATH diff --git a/reframe/core/schedulers/slurm.py b/reframe/core/schedulers/slurm.py index 6ace44c878..0da2807937 100644 --- a/reframe/core/schedulers/slurm.py +++ b/reframe/core/schedulers/slurm.py @@ -621,6 +621,7 @@ def poll(self, *jobs): # Join the states with ',' in case of job arrays job._state = ','.join(s.group('state') for s in job_match) + # Use ',' to join nodes to be consistent with Slurm syntax job._nodespec = ','.join(m.group('nodespec') for m in job_match) self._cancel_if_blocked(