Merge pull request #4922 from ESMCI/jgfouca/wait_for_tests_refactor

wait_for_tests: cdash Refactor and restore commit/time upload

Author: jgfouca

CIME/Tools/wait_for_tests

@@ -87,7 +87,7 @@ OR
     )
 
     parser.add_argument(
-        "--force-log-upload",
+        "--cdash-force-log-upload",
         action="store_true",
         help="Always upload logs to cdash, even if test passed",
     )
@@ -105,6 +105,11 @@ OR
         help="The name of the CDash project where results should be uploaded",
     )
 
+    parser.add_argument(
+        "--cdash-tmproot",
+        help="Where to put temporary files needed to do cdash submission. Default=/tmp",
+    )
+
     parser.add_argument(
         "-g",
         "--cdash-build-group",
@@ -132,9 +137,10 @@ OR
         args.ignore_memleak,
         args.cdash_build_name,
         args.cdash_project,
+        args.cdash_tmproot,
         args.cdash_build_group,
         args.timeout,
-        args.force_log_upload,
+        args.cdash_force_log_upload,
         args.no_run,
         args.update_success,
     )
@@ -153,6 +159,7 @@ def _main_func(description):
         ignore_memleak,
         cdash_build_name,
         cdash_project,
+        cdash_tmproot,
         cdash_build_group,
         timeout,
         force_log_upload,
@@ -172,6 +179,7 @@ def _main_func(description):
             ignore_memleak=ignore_memleak,
             cdash_build_name=cdash_build_name,
             cdash_project=cdash_project,
+            cdash_tmproot=cdash_tmproot,
             cdash_build_group=cdash_build_group,
             timeout=timeout,
             force_log_upload=force_log_upload,

CIME/tests/test_sys_wait_for_tests.py

@@ -9,6 +9,7 @@
 
 from CIME import utils
 from CIME import test_status
+from CIME.wait_for_tests import ENV_VAR_KEEP_CDASH
 from CIME.tests import base
 from CIME.tests import utils as test_utils
 
@@ -110,6 +111,8 @@ def tearDown(self):
             for testdir in self._testdirs:
                 shutil.rmtree(testdir)
 
+        os.environ.pop(ENV_VAR_KEEP_CDASH, None)
+
     def simple_test(self, testdir, expected_results, extra_args="", build_name=None):
         # Need these flags to test dashboard if e3sm
         if self._config.create_test_flag_mode == "e3sm" and build_name is not None:
@@ -270,6 +273,7 @@ def test_wait_for_test_cdash_pass(self):
 
     def test_wait_for_test_cdash_kill(self):
         expected_results = ["PEND" if item == 5 else "PASS" for item in range(10)]
+        os.environ[ENV_VAR_KEEP_CDASH] = "True"
         build_name = "regression_test_kill_" + self._timestamp
         run_thread = threading.Thread(
             target=self.threaded_test,