qa: do not cleanup sandbox on error

Otherwise the command will hang if the mount is broken.

Fixes: http://tracker.ceph.com/issues/36184
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d4b8f94cf8d95ebb277b550fc6ebc3468052a39c)

diff --git a/qa/tasks/workunit.py b/qa/tasks/workunit.py
index 655edf2ab98ed2dde6ce205cd6ce5af0ca11f855..2a708b80636abc94e7bb4287b09f23d466f1e47b 100644 (file)
--- a/qa/tasks/workunit.py
+++ b/qa/tasks/workunit.py
@@ -481,9 +481,7 @@ def _run_tests(ctx, refspec, role, tests, env, basedir,
     finally:
         log.info('Stopping %s on %s...', tests, role)
         args=['sudo', 'rm', '-rf', '--', workunits_file, clonedir]
-        if cleanup:
-            log.info("and cleaning up scratch: {}".format(scratch_tmp))
-            args.append(scratch_tmp)
+        # N.B. don't cleanup scratch_tmp! If the mount is broken then rm will hang.
         remote.run(
             logger=log.getChild(role),
             args=args,