Merge branch 'master' into fix/remove_kesch

Author: kraushm

Jenkinsfile

@@ -10,7 +10,7 @@ def uniqueID
 
 stage('Initialization') {
     node('master') {
-        try {
+        catchError(stageResult: 'FAILURE') {
             uniqueID = "${env.ghprbActualCommit[0..6]}-${env.BUILD_ID}"
             echo 'Environment Variables:'
             echo sh(script: 'env|sort', returnStdout: true)
@@ -55,19 +55,7 @@ stage('Initialization') {
                 currentBuild.result = 'ABORTED'
                 return
             }
-
             currentBuild.result = 'SUCCESS'
-        } catch(err) {
-            println err.toString()
-            if (err.toString().contains('exit code 143')) {
-                currentBuild.result = "ABORTED"
-            }
-            else if (err.toString().contains('Queue task was cancelled')) {
-                currentBuild.result = "ABORTED"
-            }
-            else {
-                currentBuild.result = "FAILURE"
-            }
         }
     }
 }
@@ -101,22 +89,8 @@ stage('Unittest') {
         }
     }
 
-    try {
+    catchError(stageResult: 'FAILURE') {
         parallel builds
-        currentBuild.result = "SUCCESS"
-    } catch(err) {
-        if (err.toString().contains('exit code 143')) {
-            currentBuild.result = "ABORTED"
-            println "The Unittest was cancelled. Aborting....."
-        }
-        else if (err.toString().contains('Queue task was cancelled')) {
-            currentBuild.result = "ABORTED"
-            println "The Queue task was cancelled. Aborting....."
-        }
-        else {
-            currentBuild.result = "FAILURE"
-            println "The Unittest failed. Exiting....."
-        }
     }
 }
 
@@ -127,7 +101,7 @@ stage('Tutorial Check') {
         return
     }
     else {
-        try {
+        catchError(stageResult: 'FAILURE') {
             if (!('daint' in machinesToRun)) {
                 return
             }
@@ -141,20 +115,6 @@ stage('Tutorial Check') {
                           bash ${reframeDir}/${bashScript} -f ${reframeDir} -i '' -t""")
                 }
             }
-            currentBuild.result = "SUCCESS"
-        } catch(err) {
-            if (err.toString().contains('exit code 143')) {
-                currentBuild.result = "ABORTED"
-                println "The Tutorial Check was cancelled. Aborting....."
-            }
-            else if (err.toString().contains('Queue task was cancelled')) {
-                currentBuild.result = "ABORTED"
-                println "The Queue task was cancelled. Aborting....."
-            }
-            else {
-                currentBuild.result = "FAILURE"
-                println "The Tutorial Check failed. Exiting....."
-            }
         }
     }
 }
@@ -181,22 +141,8 @@ stage('Cleanup') {
                 }
             }
         }
-        try {
+        catchError(stageResult: 'FAILURE') {
             parallel builds
-            currentBuild.result = "SUCCESS"
-        } catch(err) {
-            if (err.toString().contains('exit code 143')) {
-                currentBuild.result = "ABORTED"
-                println "The Cleanup was cancelled. Aborting....."
-            }
-            else if (err.toString().contains('Queue task was cancelled')) {
-                currentBuild.result = "ABORTED"
-                println "The Queue task was cancelled. Aborting....."
-            }
-            else {
-                currentBuild.result = "FAILURE"
-                println "The Cleanup failed. Exiting....."
-            }
         }
     }
 }
@@ -218,21 +164,7 @@ stage('Cleanup Stale') {
         }
     }
 
-    try {
+    catchError(stageResult: 'FAILURE') {
         parallel builds
-        currentBuild.result = "SUCCESS"
-    } catch(err) {
-        if (err.toString().contains('exit code 143')) {
-            currentBuild.result = "ABORTED"
-            println "The Build step was cancelled. Aborting....."
-        }
-        else if (err.toString().contains('Queue task was cancelled')) {
-            currentBuild.result = "ABORTED"
-            println "The Queue task was cancelled. Aborting....."
-        }
-        else {
-            currentBuild.result = "FAILURE"
-            println "The Build step failed. Exiting....."
-        }
     }
 }

ci-scripts/dockerfiles/Lmod.dockerfile

@@ -14,6 +14,8 @@ RUN useradd -ms /bin/bash rfmuser
 # ReFrame requirements
 RUN \
   apt-get -y update && \
+  apt-get -y install ca-certificates && \
+  update-ca-certificates && \
   apt-get -y install gcc && \
   apt-get -y install make && \
   apt-get -y install git && \

ci-scripts/dockerfiles/Tmod4.dockerfile

@@ -14,6 +14,8 @@ RUN useradd -ms /bin/bash rfmuser
 # ReFrame requirements
 RUN \
   apt-get -y update && \
+  apt-get -y install ca-certificates && \
+  update-ca-certificates && \
   apt-get -y install gcc && \
   apt-get -y install make && \
   apt-get -y install git && \

docs/started.rst

@@ -15,7 +15,7 @@ Requirements
 Optional Requirements
 ---------------------
 
-If you want to run the framework's unit tests, you will also need a C compiler that is able to compile a "Hello, World!" program and recognize the ``-O3`` option.
+If you want to run the framework's unit tests, you will need a C compiler available through `cc` that is able to compile a "Hello, World!" program and recognize the ``-O3`` option, as well as the `GNU Make <https://www.gnu.org/software/make/>`__ build tool.
 
 
 .. note::

reframe/core/pipeline.py

@@ -709,6 +709,21 @@ def disable_hook(cls, hook_name):
     extra_resources = fields.TypedField('extra_resources',
                                         typ.Dict[str, typ.Dict[str, object]])
 
+    #: .. versionadded:: 3.3
+    #:
+    #: Always build the source code for this test locally. If set to
+    #: :class:`False`, ReFrame will spawn a build job on the partition where
+    #: the test will run. Setting this to :class:`False` is useful when
+    #: cross-compilation is not supported on the system where ReFrame is run.
+    #: Normally, ReFrame will mark the test as a failure if the spawned job
+    #: exits with a non-zero exit code. However, certain scheduler backends,
+    #: such as the ``squeue`` do not set it. In such cases, it is the user's
+    #: responsibility to check whether the build phase failed by adding an
+    #: appropriate sanity check.
+    #:
+    #: :type: boolean : :default: :class:`True`
+    build_locally = fields.TypedField('build_locally', bool)
+
     def __new__(cls, *args, **kwargs):
         obj = super().__new__(cls)
 
@@ -727,7 +742,12 @@ def __new__(cls, *args, **kwargs):
             if osext.is_interactive():
                 prefix = os.getcwd()
             else:
-                prefix = os.path.abspath(os.path.dirname(inspect.getfile(cls)))
+                try:
+                    prefix = cls._rfm_pinned_prefix
+                except AttributeError:
+                    prefix = os.path.abspath(
+                        os.path.dirname(inspect.getfile(cls))
+                    )
 
         obj._rfm_init(name, prefix)
         return obj
@@ -736,10 +756,17 @@ def __init__(self):
         pass
 
     @classmethod
-    def __init_subclass__(cls, *, special=False, **kwargs):
+    def __init_subclass__(cls, *, special=False, pin_prefix=False, **kwargs):
         super().__init_subclass__(**kwargs)
         cls._rfm_special_test = special
 
+        # Insert the prefix to pin the test to if the test lives in a test
+        # library with resources in it.
+        if pin_prefix:
+            cls._rfm_pinned_prefix = os.path.abspath(
+                os.path.dirname(inspect.getfile(cls))
+            )
+
     def _rfm_init(self, name=None, prefix=None):
         if name is not None:
             self.name = name
@@ -777,6 +804,7 @@ def _rfm_init(self, name=None, prefix=None):
 
         # True only if check is to be run locally
         self.local = False
+        self.build_locally = True
 
         # Static directories of the regression check
         self._prefix = os.path.abspath(prefix)
@@ -1038,29 +1066,29 @@ def _setup_paths(self):
         except OSError as e:
             raise PipelineError('failed to set up paths') from e
 
-    def _setup_job(self, **job_opts):
+    def _setup_job(self, name, force_local=False, **job_opts):
         '''Setup the job related to this check.'''
 
-        if self.local:
+        if force_local:
             scheduler = getscheduler('local')()
             launcher = getlauncher('local')()
         else:
             scheduler = self._current_partition.scheduler
             launcher = self._current_partition.launcher_type()
 
         self.logger.debug(
-            f'Setting up run job descriptor '
+            f'Setting up job {name!r} '
             f'(scheduler: {scheduler.registered_name!r}, '
             f'launcher: {launcher.registered_name!r})'
         )
-        self._job = Job.create(scheduler,
-                               launcher,
-                               name='rfm_%s_job' % self.name,
-                               workdir=self._stagedir,
-                               max_pending_time=self.max_pending_time,
-                               sched_access=self._current_partition.access,
-                               sched_exclusive_access=self.exclusive_access,
-                               **job_opts)
+        return Job.create(scheduler,
+                          launcher,
+                          name=name,
+                          workdir=self._stagedir,
+                          max_pending_time=self.max_pending_time,
+                          sched_access=self._current_partition.access,
+                          sched_exclusive_access=self.exclusive_access,
+                          **job_opts)
 
     def _setup_perf_logging(self):
         self._perf_logger = logging.getperflogger(self)
@@ -1089,7 +1117,12 @@ def setup(self, partition, environ, **job_opts):
         self._current_partition = partition
         self._current_environ = environ
         self._setup_paths()
-        self._setup_job(**job_opts)
+        self._job = self._setup_job(f'rfm_{self.name}_job',
+                                    self.local,
+                                    **job_opts)
+        self._build_job = self._setup_job(f'rfm_{self.name}_build',
+                                          self.local or self.build_locally,
+                                          **job_opts)
 
     def _copy_to_stagedir(self, path):
         self.logger.debug(f'Copying {path} to stage directory')
@@ -1191,10 +1224,6 @@ def compile(self):
         environs = [self._current_partition.local_env, self._current_environ,
                     user_environ, self._cdt_environ]
 
-        self._build_job = Job.create(getscheduler('local')(),
-                                     launcher=getlauncher('local')(),
-                                     name='rfm_%s_build' % self.name,
-                                     workdir=self._stagedir)
         with osext.change_dir(self._stagedir):
             try:
                 self._build_job.prepare(
@@ -1225,8 +1254,8 @@ def compile_wait(self):
         '''
         self._build_job.wait()
 
-        # FIXME: this check is not reliable for certain scheduler backends
-        if self._build_job.exitcode != 0:
+        # We raise a BuildError when we an exit code and it is non zero
+        if self._build_job.exitcode:
             raise BuildError(self._build_job.stdout, self._build_job.stderr)
 
     @_run_hooks('pre_run')
@@ -1760,6 +1789,20 @@ class RunOnlyRegressionTest(RegressionTest, special=True):
     module.
     '''
 
+    @_run_hooks()
+    def setup(self, partition, environ, **job_opts):
+        '''The setup stage of the regression test pipeline.
+
+        Similar to the :func:`RegressionTest.setup`, except that no build job
+        is created for this test.
+        '''
+        self._current_partition = partition
+        self._current_environ = environ
+        self._setup_paths()
+        self._job = self._setup_job(f'rfm_{self.name}_job',
+                                    self.local,
+                                    **job_opts)
+
     def compile(self):
         '''The compilation phase of the regression test pipeline.
 
@@ -1802,21 +1845,20 @@ class CompileOnlyRegressionTest(RegressionTest, special=True):
     module.
     '''
 
-    def _rfm_init(self, *args, **kwargs):
-        super()._rfm_init(*args, **kwargs)
-        self.local = True
-
     @_run_hooks()
     def setup(self, partition, environ, **job_opts):
         '''The setup stage of the regression test pipeline.
 
-        Similar to the :func:`RegressionTest.setup`, except that no job
-        descriptor is set up for this test.
+        Similar to the :func:`RegressionTest.setup`, except that no run job
+        is created for this test.
         '''
         # No need to setup the job for compile-only checks
         self._current_partition = partition
         self._current_environ = environ
         self._setup_paths()
+        self._build_job = self._setup_job(f'rfm_{self.name}_build',
+                                          self.local or self.build_locally,
+                                          **job_opts)
 
     @property
     @sn.sanity_function

reframe/core/schedulers/slurm.py

@@ -562,9 +562,6 @@ def poll(self, *jobs):
                 job_match = jobinfo[job.jobid]
             except KeyError:
                 job._state = 'CANCELLED' if job.is_cancelling else 'COMPLETED'
-                if job.exitcode is None:
-                    job._exitcode = 0
-
                 continue
 
             # Join the states with ',' in case of job arrays

reframe/frontend/cli.py

@@ -594,7 +594,7 @@ def print_infoline(param, value):
     session_info = {
         'cmdline': ' '.join(sys.argv),
         'config_file': rt.site_config.filename,
-        'data_version': '1.0',
+        'data_version': '1.1',
         'hostname': socket.gethostname(),
         'prefix_output': rt.output_prefix,
         'prefix_stage': rt.stage_prefix,

reframe/frontend/statistics.py

@@ -82,15 +82,22 @@ def json(self, force=False):
                 entry = {
                     'build_stderr': None,
                     'build_stdout': None,
+                    'dependencies_actual': [
+                        (d.check.name, d.partition.fullname, d.environ.name)
+                        for d in t.testcase.deps
+                    ],
+                    'dependencies_conceptual': [
+                        d[0] for d in t.check.user_deps()
+                    ],
                     'description': check.descr,
                     'environment': None,
-                    'fail_reason': None,
                     'fail_phase': None,
+                    'fail_reason': None,
                     'jobid': None,
                     'job_stderr': None,
                     'job_stdout': None,
-                    'name': check.name,
                     'maintainers': check.maintainers,
+                    'name': check.name,
                     'nodelist': [],
                     'outputdir': None,
                     'perfvars': None,
@@ -192,6 +199,10 @@ def print_failure_report(self, printer):
             job_type = 'local' if r['scheduler'] == 'local' else 'batch job'
             jobid = r['jobid']
             printer.info(f"  * Job type: {job_type} (id={r['jobid']})")
+            printer.info(f"  * Dependencies (conceptual): "
+                         f"{r['dependencies_conceptual']}")
+            printer.info(f"  * Dependencies (actual): "
+                         f"{r['dependencies_actual']}")
             printer.info(f"  * Maintainers: {r['maintainers']}")
             printer.info(f"  * Failing phase: {r['fail_phase']}")
             printer.info(f"  * Rerun with '-n {r['name']}"