From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 24 Sep 2018 18:29:10 +0000 (-0700)
Subject: qa: cleanup workunit dir for each unit
X-Git-Tag: v13.2.3~106^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=980ef82b00cfa9fdf2b1d3618c33d35c26160ec1;p=ceph.git

qa: cleanup workunit dir for each unit

This was wrongly dropped and moved to the finalizer.

Introduced-by: de824f74dd8ac909e47335ccd53d7a085e388e41
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 70844f3f55004024a747854013a1efb409705d81)
---

diff --git a/qa/tasks/workunit.py b/qa/tasks/workunit.py
index 4f60132c05312..71f272e3d08c8 100644
--- a/qa/tasks/workunit.py
+++ b/qa/tasks/workunit.py
@@ -478,6 +478,9 @@ def _run_tests(ctx, refspec, role, tests, env, basedir,
                     args=args,
                     label="workunit test {workunit}".format(workunit=workunit)
                 )
+                if cleanup:
+                    args=['sudo', 'rm', '-rf', '--', scratch_tmp]
+                    remote.run(logger=log.getChild(role), args=args)
     finally:
         log.info('Stopping %s on %s...', tests, role)
         args=['sudo', 'rm', '-rf', '--', workunits_file, clonedir]