WIP: Dont restage

Author: Vasileios Karakasis

reframe/core/runtime.py

@@ -42,6 +42,11 @@ def _makedir(self, *dirs, wipeout=False):
         return ret
 
     def _format_dirs(self, *dirs):
+        if not self.get_option('general/0/clean_stagedir'):
+            # If stagedir is to be reused, no new stage directories will be
+            # used for retries
+            return dirs
+
         try:
             last = dirs[-1]
         except IndexError:
@@ -134,11 +139,13 @@ def stage_prefix(self):
 
         return os.path.abspath(ret)
 
-    def make_stagedir(self, *dirs, wipeout=True):
+    def make_stagedir(self, *dirs):
+        wipeout = self.get_option('general/0/clean_stagedir')
         return self._makedir(self.stage_prefix,
                              *self._format_dirs(*dirs), wipeout=wipeout)
 
-    def make_outputdir(self, *dirs, wipeout=True):
+    def make_outputdir(self, *dirs):
+        wipeout = self.get_option('general/0/clean_stagedir')
         return self._makedir(self.output_prefix,
                              *self._format_dirs(*dirs), wipeout=wipeout)
 

reframe/frontend/cli.py

@@ -126,6 +126,11 @@ def main():
         help='Keep stage directories even for successful checks',
         envvar='RFM_KEEP_STAGE_FILES', configvar='general/keep_stage_files'
     )
+    output_options.add_argument(
+        '--dont-restage', action='store_false', dest='clean_stagedir',
+        help='Reuse the test stage directory',
+        envvar='RFM_CLEAN_STAGEDIR', configvar='general/clean_stagedir'
+    )
     output_options.add_argument(
         '--save-log-files', action='store_true', default=False,
         help='Save ReFrame log files to the output directory',

reframe/schemas/config.json

@@ -350,6 +350,7 @@
                         "items": {"type": "string"}
                     },
                     "check_search_recursive": {"type": "boolean"},
+                    "clean_stagedir": {"type": "boolean"},
                     "colorize": {"type": "boolean"},
                     "ignore_check_conflicts": {"type": "boolean"},
                     "keep_stage_files": {"type": "boolean"},
@@ -394,6 +395,7 @@
         "environments/target_systems": ["*"],
         "general/check_search_path": ["${RFM_INSTALL_PREFIX}/checks/"],
         "general/check_search_recursive": false,
+        "general/clean_stagedir": true,
         "general/colorize": true,
         "general/ignore_check_conflicts": false,
         "general/keep_stage_files": false,

unittests/test_cli.py

@@ -221,6 +221,31 @@ def test_check_sanity_failure(run_reframe, tmp_path):
     )
 
 
+def test_dont_restage(run_reframe, tmp_path):
+    run_reframe(
+        checkpath=['unittests/resources/checks/frontend_checks.py'],
+        more_options=['-t', 'SanityFailureCheck']
+    )
+
+    # Place a random file in the test's stage directory and rerun with
+    # `--dont-restage` and `--max-retries`
+    stagedir = (tmp_path / 'stage' / 'generic' / 'default' /
+                'builtin-gcc' / 'SanityFailureCheck')
+    (stagedir / 'foobar').touch()
+    returncode, stdout, stderr = run_reframe(
+        checkpath=['unittests/resources/checks/frontend_checks.py'],
+        more_options=['-t', 'SanityFailureCheck',
+                      '--dont-restage', '--max-retries=1']
+    )
+    assert os.path.exists(stagedir / 'foobar')
+    assert not os.path.exists(f'{stagedir}_retry1')
+
+    # And some standard assertions
+    assert 'Traceback' not in stdout
+    assert 'Traceback' not in stderr
+    assert returncode != 0
+
+
 def test_checkpath_symlink(run_reframe, tmp_path):
     # FIXME: This should move to test_loader.py
     checks_symlink = tmp_path / 'checks_symlink'