From 1f1e38b750909fe8a3fa84640e9cdbf31d419648 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 11 Apr 2024 15:13:10 -0400 Subject: [PATCH] script/ptl-tool: push branch to shaman for qa runs Signed-off-by: Patrick Donnelly --- src/script/ptl-tool.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/script/ptl-tool.py b/src/script/ptl-tool.py index 215db9cc06acf..0a152dc74313d 100755 --- a/src/script/ptl-tool.py +++ b/src/script/ptl-tool.py @@ -452,7 +452,7 @@ def build_branch(args): log.info("Created tag %s" % tag) if args.create_qa: - if created_branch is None: + if not created_branch: log.error("branch already exists!") sys.exit(1) project = R.project.get(REDMINE_PROJECT_QA) @@ -473,7 +473,8 @@ def build_branch(args): custom_fields.append({'id': REDMINE_CUSTOM_FIELD_ID_QA_RUNS, 'value': branch}) custom_fields.append({'id': REDMINE_CUSTOM_FIELD_ID_QA_RELEASE, 'value': args.qa_release}) - G.git.push(CI_REMOTE_URL, tag.name) + G.git.push(CI_REMOTE_URL, branch) # for shaman + G.git.push(CI_REMOTE_URL, tag.name) # for archival origin_url = f'{BASE_PROJECT}/{CI_REPO}/commits/{tag.name}' custom_fields.append({'id': REDMINE_CUSTOM_FIELD_ID_GIT_BRANCH, 'value': origin_url}) -- 2.39.5