Use f strings in oar scheduler. Add entry for oar in docs

Author: mahendrapaipuri

docs/config_reference.rst

@@ -218,6 +218,7 @@ System Partition Configuration
      If not, you should consider using the ``squeue`` backend below.
    - ``squeue``: Jobs will be launched using the `Slurm <https://www.schedmd.com/>`__ scheduler.
      This backend does not rely on job accounting to retrieve job statuses, but ReFrame does its best to query the job state as reliably as possible.
+   - ``oar``: Jobs will be launched using the `OAR <https://oar.imag.fr/>`__ scheduler.
 
    .. versionadded:: 3.7.2
       Support for the SGE scheduler is added.

docs/tutorial_tips_tricks.rst

@@ -552,8 +552,10 @@ The following is an example of ``.gitlab-ci.yml`` file that does exactly that:
 It defines two stages.
 The first one, called ``generate``, will call ReFrame to generate the pipeline specification for the desired tests.
 All the usual `test selection options <manpage.html#test-filtering>`__ can be used to select specific tests.
-ReFrame will process them as usual, but instead of running the selected tests, it will generate the correct steps for running each test individually as a Gitlab job.
-We then pass the generated CI pipeline file to second phase as an artifact and we are done!
+ReFrame will process them as usual, but instead of running the selected tests, it will generate the correct steps
+for running each test individually as a Gitlab job. We then pass the generated CI pipeline file to second phase as
+an artifact and we are done! If ``image`` keyword is defined in ``.gitlab-ci.yml``, the emitted pipeline will use
+the same image as the one defined in the parent pipeline.
 
 The following figure shows one part of the automatically generated pipeline for the test graph depicted `above <#fig-deps-complex>`__.
 

reframe/core/schedulers/oar.py

@@ -72,11 +72,9 @@ def emit_preamble(self, job):
         # Same reason as oarsub, we give full path to output and error files to
         # avoid writing them in the working dir
         preamble = [
-            self._format_option('-n "%s"' % job.name),
-            self._format_option('-O %s' %
-                                os.path.join(job.workdir, job.stdout)),
-            self._format_option('-E %s' %
-                                os.path.join(job.workdir, job.stderr)),
+            self._format_option(f'-n "{job.name}"'),
+            self._format_option(f'-O {os.path.join(job.workdir, job.stdout)}'),
+            self._format_option(f'-E {os.path.join(job.workdir, job.stderr)}'),
         ]
 
         if job.time_limit is not None:
@@ -102,7 +100,7 @@ def emit_preamble(self, job):
                 preamble.append(self._format_option(opt))
 
         # OAR starts the job in the home directory by default
-        preamble.append('cd %s' % job.workdir)
+        preamble.append(f'cd {job.workdir}')
         return preamble
 
     def submit(self, job):
@@ -136,16 +134,10 @@ def poll(self, *jobs):
             return
 
         for job in jobs:
-            completed = osext.run_command(
+            completed = _run_strict(
                 f'oarstat -fj {job.jobid}'
             )
 
-            if completed.returncode != 0:
-                raise JobSchedulerError(
-                    f'oarstat failed with exit code {completed.returncode} '
-                    f'(standard error follows):\n{completed.stderr}'
-                )
-
             # Store information for each job separately
             jobinfo = {}
 

unittests/test_schedulers.py

@@ -213,15 +213,14 @@ def _expected_oar_directives(job):
     num_nodes = job.num_tasks // job.num_tasks_per_node
     num_tasks_per_node = job.num_tasks_per_node
     return set([
-        '#OAR -n "testjob"',
-        '#OAR -O %s' % job.stdout,
-        '#OAR -E %s' % job.stderr,
-        '#OAR -l /host=%s/core=%s,walltime=0:5:0' % (num_nodes,
-                                                     num_tasks_per_node),
-        '#OAR --account=spam',
-        '#OAR --gres=gpu:4',
-        '#DW jobdw capacity=100GB',
-        '#DW stage_in source=/foo'
+        f'#OAR -n "testjob"',
+        f'#OAR -O {job.stdout}',
+        f'#OAR -E {job.stderr}',
+        f'#OAR -l /host={num_nodes}/core={num_tasks_per_node},walltime=0:5:0'
+        f'#OAR --account=spam',
+        f'#OAR --gres=gpu:4',
+        f'#DW jobdw capacity=100GB',
+        f'#DW stage_in source=/foo'
     ])