workunit: Move cleanup to separate run

Removing the scratchdir in the remote run command
at the end of the script invocation will do the remove
once the first script finishes.  With possibly a shared
scratch dir across workunit clients, we want to wait to
remove the scratch dir once all the workunit scripts have
completed.

Signed-off-by: Sam Lang <sam.lang@inktank.com>

diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py
index 536f9bd906bd4b2eb7fbe01da71740501e2bcff6..05efa07ffc95993ecaa8cd104b0649004bb0f930 100644 (file)
--- a/teuthology/task/workunit.py
+++ b/teuthology/task/workunit.py
@@ -216,13 +216,15 @@ def _run_tests(ctx, refspec, role, tests, env, subdir):
                             srcdir=srcdir,
                             workunit=workunit,
                             ),
-                        run.Raw('&&'),
-                        'rm', '-rf', '--', scratch_tmp,
                         ])
                 remote.run(
                     logger=log.getChild(role),
                     args=args,
                     )
+                remote.run(
+                    logger=log.getChild(role),
+                    args=['rm', '-rf', '--', scratch_tmp],
+                    )
     finally:
          log.info('Stopping %s on %s...', spec, role)
         remote.run(