From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 12 Oct 2018 14:02:35 +0000 (-0400)
Subject: qa/tasks/workunit: use suite branch/SHA1 when cloning workunits
X-Git-Tag: v14.0.1~50^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e3dc02604cf7c0d3991dfd9fe2596ea34e80bad;p=ceph.git

qa/tasks/workunit: use suite branch/SHA1 when cloning workunits

Right now it's using the Ceph branch/SHA1 but it's using the suite
Git URL.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/tasks/util/workunit.py b/qa/tasks/util/workunit.py
index 16d0721e6d8f..c5314330ffbf 100644
--- a/qa/tasks/util/workunit.py
+++ b/qa/tasks/util/workunit.py
@@ -61,7 +61,8 @@ def get_refspec_after_overrides(config, overrides):
     # "tag", or "branch" is specified by a "workunit" tasks, we will update
     # it with the information in the "workunit" sub-task nested in "overrides".
     overrides = copy.deepcopy(overrides.get('workunit', {}))
-    refspecs = {'branch': Branch, 'tag': Refspec, 'sha1': Refspec}
+    refspecs = {'suite_sha1': Refspec, 'suite_branch': Branch,
+                'sha1': Refspec, 'tag': Refspec, 'branch': Branch}
     if any(map(lambda i: i in config, refspecs.iterkeys())):
         for i in refspecs.iterkeys():
             overrides.pop(i, None)