From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 26 Sep 2018 14:38:58 +0000 (-0700)
Subject: qa: do not cleanup sandbox on error
X-Git-Tag: v12.2.9~10^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1104f0247dceb4b87e34883e4fda68b99439eb1d;p=ceph.git

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 655edf2ab98ed..2a708b80636ab 100644
--- 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,