From 0eabc3f67ba194224b3f4c6142302fd1b757c3c1 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 6 Dec 2022 08:58:37 +0100 Subject: [PATCH] MT#55524 build: use /master as branch instead of master In order to support building the next supported release using the special branch /master if exists. Jenkins job -get-code will detect the missing branch and fallback to master if necessary Change-Id: I798b5b1653e52e9cb4b91e9aca18cf7ec6a0916a --- build/test/test_utils.py | 2 +- build/utils.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/test/test_utils.py b/build/test/test_utils.py index 04c3fda..996c915 100644 --- a/build/test/test_utils.py +++ b/build/test/test_utils.py @@ -430,7 +430,7 @@ class TriggerBuild(SimpleTestCase): "{base}/job/{project}/buildWithParameters?" "token={token}&cause={trigger_release}&uuid={uuid}&" "release_uuid={release_uuid}&" - "branch=master&tag=none&" + "branch={trigger_distribution}/master&tag=none&" "release=trunk&distribution={trigger_distribution}" ) res = trigger_build(**params) diff --git a/build/utils.py b/build/utils.py index 3b3f9b6..5f7e030 100644 --- a/build/utils.py +++ b/build/utils.py @@ -159,6 +159,8 @@ def trigger_build( params["branch"] = urllib.parse.quote(branch) elif trigger_branch_or_tag.startswith("branch/"): branch = trigger_branch_or_tag.split("branch/")[1] + if branch == "master": + branch = f"{trigger_distribution}/master" params["branch"] = urllib.parse.quote(branch) else: params["branch"] = urllib.parse.quote(trigger_branch_or_tag)