Merge branch 'master' into enhancement/drop_override_support

Author: Vasileios Karakasis

config/cscs.py

@@ -267,8 +267,9 @@
                         'builtin'
                     ],
                     'access': [
-                        '-Cgpu',
-                        '--reservation=jupyter_gpu'
+                        f'-Cgpu',
+                        f'--reservation=jupyter_gpu',
+                        f'--account={osext.osgroup()}'
                     ],
                     'descr': 'JupyterHub GPU nodes',
                     'max_jobs': 10,
@@ -281,8 +282,9 @@
                         'builtin'
                     ],
                     'access': [
-                        '-Cmc',
-                        '--reservation=jupyter_mc'
+                        f'-Cmc',
+                        f'--reservation=jupyter_mc',
+                        f'--account={osext.osgroup()}'
                     ],
                     'descr': 'JupyterHub multicore nodes',
                     'max_jobs': 10,
@@ -404,8 +406,9 @@
                         'builtin'
                     ],
                     'access': [
-                        '-Cgpu',
-                        '--reservation=jupyter_gpu'
+                        f'-Cgpu',
+                        f'--reservation=jupyter_gpu',
+                        f'--account={osext.osgroup()}'
                     ],
                     'descr': 'JupyterHub GPU nodes',
                     'max_jobs': 10,
@@ -418,8 +421,9 @@
                         'builtin'
                     ],
                     'access': [
-                        '-Cmc',
-                        '--reservation=jupyter_mc'
+                        f'-Cmc',
+                        f'--reservation=jupyter_mc',
+                        f'--account={osext.osgroup()}'
                     ],
                     'descr': 'JupyterHub multicore nodes',
                     'max_jobs': 10,

cscs-checks/system/slurm/slurm.py

@@ -91,10 +91,9 @@ def __init__(self):
         self.executable = 'srun'
         self.executable_opts = ['-A', osext.osgroup(), 'hostname']
         self.sanity_patterns = sn.assert_found(
-            r'error: You have to specify, at least, what sort of node you '
-            r'need: -C gpu for GPU enabled nodes, or -C mc for multicore '
-            r'nodes.|ERROR: you must specify -C with one of the following: '
-            r'mc,gpu,storage', self.stderr)
+            r'ERROR: you must specify -C with one of the following: mc,gpu',
+            self.stderr
+        )
 
 
 @rfm.simple_test

reframe/frontend/cli.py

@@ -56,7 +56,8 @@ def fmt_deps():
         return f'- {check.name} (found in {location!r})'
 
     if check.num_tasks > 0:
-        node_alloc_scheme = f'standard ({check.num_tasks} task(s))'
+        node_alloc_scheme = (f'standard ({check.num_tasks} task(s) -- '
+                             f'may be set differently in hooks)')
     elif check.num_tasks == 0:
         node_alloc_scheme = 'flexible'
     else: