From 1e3dc02604cf7c0d3991dfd9fe2596ea34e80bad Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Fri, 12 Oct 2018 10:02:35 -0400 Subject: [PATCH] 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 --- qa/tasks/util/workunit.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qa/tasks/util/workunit.py b/qa/tasks/util/workunit.py index 16d0721e6d8f8..c5314330ffbfe 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) -- 2.39.5