]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/workunit: use suite branch/SHA1 when cloning workunits 24622/head
authorJason Dillaman <dillaman@redhat.com>
Fri, 12 Oct 2018 14:02:35 +0000 (10:02 -0400)
committerJason Dillaman <dillaman@redhat.com>
Mon, 22 Oct 2018 15:22:46 +0000 (11:22 -0400)
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>
(cherry picked from commit 1e3dc02604cf7c0d3991dfd9fe2596ea34e80bad)

qa/tasks/util/workunit.py

index 16d0721e6d8f80c12e9f3633289705e3d7f3c765..c5314330ffbfe4df1a1c4bf9b70336232a6595a9 100644 (file)
@@ -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)