Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions reframe/core/schedulers/slurm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
)
Expand Down