From 1d156e41044b56faaf61da554a79d73bfea85168 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Mon, 8 Jun 2020 10:44:25 +0200 Subject: [PATCH 1/2] Remove Tsa/Arolla from MemoryOverConsumption check --- cscs-checks/system/slurm/slurm.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cscs-checks/system/slurm/slurm.py b/cscs-checks/system/slurm/slurm.py index 458172d1eb..1175659524 100644 --- a/cscs-checks/system/slurm/slurm.py +++ b/cscs-checks/system/slurm/slurm.py @@ -32,14 +32,13 @@ class SlurmCompiledBaseCheck(rfm.RegressionTest): def __init__(self): self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'kesch:cn', 'kesch:pn', - 'arolla:cn', 'arolla:pn', - 'tsa:cn', 'tsa:pn'] + 'kesch:cn', 'kesch:pn'] self.valid_prog_environs = ['PrgEnv-cray'] self.tags = {'slurm', 'maintenance', 'ops', 'production', 'single-node'} self.num_tasks_per_node = 1 - if self.current_system.name in ['arolla', 'kesch', 'tsa']: + if self.current_system.name in ['kesch']: + self.valid_prog_environs = ['PrgEnv-gnu'] self.exclusive_access = True self.maintainers = ['RS', 'VH'] From 3b695d3731a0fa61bd4585d70bc88a3dbe9ffdf1 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Mon, 8 Jun 2020 10:49:17 +0200 Subject: [PATCH 2/2] Align MemoryOverConsumption Kesch settings with master --- cscs-checks/system/slurm/slurm.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cscs-checks/system/slurm/slurm.py b/cscs-checks/system/slurm/slurm.py index 1175659524..39321e7b3b 100644 --- a/cscs-checks/system/slurm/slurm.py +++ b/cscs-checks/system/slurm/slurm.py @@ -38,7 +38,6 @@ def __init__(self): 'production', 'single-node'} self.num_tasks_per_node = 1 if self.current_system.name in ['kesch']: - self.valid_prog_environs = ['PrgEnv-gnu'] self.exclusive_access = True self.maintainers = ['RS', 'VH']