From: Sage Weil <sage@redhat.com>
Date: Thu, 15 Dec 2016 18:25:23 +0000 (-0500)
Subject: qa/tasks/workunit: leave workunits inside git checkout
X-Git-Tag: v10.2.6~144^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=117d38e2382bc0016729387aba1dfaae9bb7a684;p=ceph.git

qa/tasks/workunit: leave workunits inside git checkout

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4602884ab8f5a256d13091f7239d938990482d95)
---

diff --git a/qa/tasks/workunit.py b/qa/tasks/workunit.py
index d424b324110d..2bdf699f5e04 100644
--- a/qa/tasks/workunit.py
+++ b/qa/tasks/workunit.py
@@ -305,8 +305,8 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None, timeout=None):
         scratch_tmp = os.path.join(mnt, 'client.{id}'.format(id=id_), 'tmp')
     else:
         scratch_tmp = os.path.join(mnt, subdir)
-    srcdir = '{tdir}/workunit.{role}'.format(tdir=testdir, role=role)
     clonedir = '{tdir}/clone.{role}'.format(tdir=testdir, role=role)
+    srcdir = '{cdir}/qa/workunits'.format(cdir=clonedir)
 
     git_url = teuth_config.get_ceph_git_url()
     remote.run(
@@ -320,8 +320,6 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None, timeout=None):
             'cd', '--', clonedir,
             run.Raw('&&'),
             'git', 'checkout', refspec,
-            run.Raw('&&'),
-            'mv', 'qa/workunits', srcdir,
         ],
     )
 
@@ -394,6 +392,6 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None, timeout=None):
         remote.run(
             logger=log.getChild(role),
             args=[
-                'rm', '-rf', '--', workunits_file, srcdir, clonedir,
+                'rm', '-rf', '--', workunits_file, clonedir,
             ],
         )