Merge branch 'master' into develop

Author: vkarak

bootstrap.sh

@@ -116,10 +116,10 @@ if [ -n "$PYGELF" ]; then
     sed -e 's/^#+pygelf%//g' requirements.txt > $tmp_requirements
     CMD_M +pygelf $python -m pip install --no-cache-dir -q -r $tmp_requirements --target=$py_pkg_prefix/ --upgrade $PIPOPTS && rm $tmp_requirements
 else
-    CMD $python -m pip install --no-cache-dir -q -r requirements.txt --target=$py_pkg_prefix/ --upgrade $PIPOPTS
+    CMD $python -m pip install --use-pep517 --no-cache-dir -q -r requirements.txt --target=$py_pkg_prefix/ --upgrade $PIPOPTS
 fi
 
 if [ -n "$MAKEDOCS" ]; then
-    CMD_M +docs $python -m pip install --no-cache-dir -q -r docs/requirements.txt --target=$py_pkg_prefix/ --upgrade $PIPOPTS
+    CMD_M +docs $python -m pip install --use-pep517 --no-cache-dir -q -r docs/requirements.txt --target=$py_pkg_prefix/ --upgrade $PIPOPTS
     make -C docs PYTHON=$python
 fi

docs/config_reference.rst

@@ -336,6 +336,17 @@ System Partition Configuration
    .. versionadded:: 4.4
       The ``ssh`` scheduler is added.
 
+   .. versionchanged:: 4.8.1
+      All ``SBATCH_*`` variables are unset before submitting a job through the Slurm-based backends.
+      See note below for information.
+
+   .. note::
+      The Slurm-based backends unset all ``SBATCH_*`` environment variables before submitting a job.
+      This is done to avoid environment variables bypassing ReFrame's configuration.
+      For example, if the :attr:`~config.systems.partitions.access` options for a partition used ``-A foo`` and ``SBATCH_ACCOUNT=bar`` was set, then the environment variable would override the configuration, as ReFrame emits those (by default) in the submission script.
+
+      Job submission in ReFrame is controlled exclusively by the system partition's :attr:`~config.systems.partitions.access` options, the test job's :attr:`~reframe.core.schedulers.Job.options` and the :option:`-J` command-line option.
+
    .. note::
 
       The way that multiple node jobs are submitted using the SGE scheduler can be very site-specific.

docs/requirements.txt

@@ -1,4 +1,5 @@
 archspec==0.2.5
+ClusterShell==1.9.3
 docutils==0.18.1; python_version < '3.9'
 docutils==0.21.2; python_version >= '3.9'
 jinja2==3.0.3; python_version == '3.6'

reframe/core/launchers/__init__.py

@@ -54,7 +54,7 @@ class JobLauncher(metaclass=_JobLauncherMeta):
     #: :type: :class:`List[str]`
     #: :default: ``[]``
     #:
-    #: :versionadded:: 4.6.0
+    #: .. versionadded:: 4.6.0
     modifier_options = variable(typ.List[str], value=[])
 
     def __init__(self):

reframe/core/schedulers/slurm.py

@@ -6,6 +6,7 @@
 import functools
 import glob
 import itertools
+import os
 import re
 import shlex
 import time
@@ -260,17 +261,35 @@ def emit_preamble(self, job):
         # Filter out empty statements before returning
         return list(filter(None, preamble))
 
+    def sbatch(self, args):
+        '''Run sbatch using a clean environment
+
+        We unset all `SBATCH_*` environment variables before submitting;
+        submission should be controlled entirely by ReFrame through the
+        partition's `access` options, the test's `job.options` and the
+        command-line `-J` option
+        '''
+
+        with rt.temp_environment():
+            for var in [name for name in os.environ.keys()
+                        if name.startswith('SBATCH_')]:
+                self.log(f'unsetting environment variable {var}',
+                         logging.DEBUG)
+                del os.environ[var]
+
+            cmd = ' '.join(['sbatch'] + args)
+            return _run_strict(cmd, timeout=self._submit_timeout)
+
     def submit(self, job):
-        cmd_parts = ['sbatch']
+        sbatch_args = []
         if self._sched_access_in_submit:
-            cmd_parts += job.sched_access
+            sbatch_args += job.sched_access
 
-        cmd_parts += [job.script_filename]
-        cmd = ' '.join(cmd_parts)
+        sbatch_args += [job.script_filename]
         intervals = itertools.cycle([1, 2, 3])
         while True:
             try:
-                completed = _run_strict(cmd, timeout=self._submit_timeout)
+                completed = self.sbatch(sbatch_args)
                 break
             except SpawnedProcessError as e:
                 error_match = re.search(

reframe/frontend/cli.py

@@ -1232,6 +1232,7 @@ def print_infoline(param, value):
 
     # Print command line
     session_info = report['session_info']
+    storage_status = 'on' if rt.get_option('storage/0/enable') else 'off'
     printer.info('[ReFrame Setup]')
     print_infoline('version', session_info['version'])
     print_infoline('command', repr(session_info['cmdline']))
@@ -1254,7 +1255,8 @@ def print_infoline(param, value):
                    ', '.join(repr(s) for s in session_info['log_files']))
     print_infoline(
         'results database',
-        repr(osext.expandvars(rt.get_option('storage/0/sqlite_db_file')))
+        f'[{storage_status}] '
+        f'{osext.expandvars(rt.get_option("storage/0/sqlite_db_file"))!r}'
     )
     printer.info('')
     try:

reframe/frontend/printer.py

@@ -119,7 +119,7 @@ def _file_info(filename, prefix):
 
         def _print_failure_info(rec, runid, total_runs):
             self.info(line_width * '-')
-            self.info(f"FAILURE INFO for {rec['name']} "
+            self.info(f"FAILURE INFO for {rec['display_name']} "
                       f"(run: {runid}/{total_runs})")
             self.info(f"  * Description: {rec['descr']}")
             self.info(f"  * System partition: {rec['system']}")

reframe/frontend/reporting/__init__.py

@@ -646,13 +646,11 @@ def _group_testcases(testcases, groups, columns):
 @time_function
 def _aggregate_perf(grouped_testcases, aggr_fn, cols):
     # Update delimiter for joining unique values based on the table format
-    table_foramt = runtime().get_option('general/0/table_format')
-    if table_foramt == 'csv':
-        delim = '|'
-    elif table_foramt == 'plain':
-        delim = ','
-    else:
+    table_format = runtime().get_option('general/0/table_format')
+    if table_format == 'pretty':
         delim = '\n'
+    else:
+        delim = '|'
 
     other_aggr = Aggregator.create('join_uniq', delim)
     count_aggr = Aggregator.create('count')