From 5a1a6cf49d0ba5f514fae6652ace51de25cc7433 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Mon, 17 Jun 2019 10:01:08 +0200 Subject: [PATCH 1/2] Fix DefaultRequestGPUSetsGRES for updated slurm output --- cscs-checks/system/slurm/slurm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/system/slurm/slurm.py b/cscs-checks/system/slurm/slurm.py index c53d2c1b24..1fbc1192f3 100644 --- a/cscs-checks/system/slurm/slurm.py +++ b/cscs-checks/system/slurm/slurm.py @@ -117,7 +117,7 @@ def __init__(self): super().__init__() self.valid_systems = ['daint:gpu', 'dom:gpu'] self.executable = 'scontrol show job ${SLURM_JOB_ID}' - self.sanity_patterns = sn.assert_found(r'.*Gres=.*gpu:1.*', + self.sanity_patterns = sn.assert_found(r'.*TresPerNode=.*gpu:1.*', self.stdout) From 25d7c5a6bfe3dcb3275bcd853fc2703e6e3def6f Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Mon, 17 Jun 2019 14:29:54 +0200 Subject: [PATCH 2/2] Support also the also slurm format --- cscs-checks/system/slurm/slurm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cscs-checks/system/slurm/slurm.py b/cscs-checks/system/slurm/slurm.py index 1fbc1192f3..18214ba7c5 100644 --- a/cscs-checks/system/slurm/slurm.py +++ b/cscs-checks/system/slurm/slurm.py @@ -117,8 +117,8 @@ def __init__(self): super().__init__() self.valid_systems = ['daint:gpu', 'dom:gpu'] self.executable = 'scontrol show job ${SLURM_JOB_ID}' - self.sanity_patterns = sn.assert_found(r'.*TresPerNode=.*gpu:1.*', - self.stdout) + self.sanity_patterns = sn.assert_found( + r'.*(TresPerNode|Gres)=.*gpu:1.*', self.stdout) @rfm.simple_test