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 550f0d3a8a..0da2807937 100644 --- a/reframe/core/schedulers/slurm.py +++ b/reframe/core/schedulers/slurm.py @@ -621,6 +621,9 @@ 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] )