From 753e79f548f7fe515c93f275f2cb2cd499b15557 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 2 Jun 2022 13:01:03 +0200 Subject: [PATCH] TT#15305 build: fix get_common_release for trunk-weekly Change-Id: Id19002bf24a4416e835d4765e87f9d4b3637b746 --- build/test/test_utils.py | 3 +++ build/utils.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build/test/test_utils.py b/build/test/test_utils.py index 5a9b146..64f96d4 100644 --- a/build/test/test_utils.py +++ b/build/test/test_utils.py @@ -76,6 +76,9 @@ class CommonReleaseTest(SimpleTestCase): val = get_common_release("release-trunk-buster") self.assertEqual(val, "master") + val = get_common_release("trunk-weekly") + self.assertEqual(val, "master") + def test_branch_release(self): val = get_common_release("release-mr8.0") self.assertEqual(val, "mr8.0") diff --git a/build/utils.py b/build/utils.py index 43562c4..9a32f5a 100644 --- a/build/utils.py +++ b/build/utils.py @@ -66,7 +66,10 @@ def get_common_release(version): match = re_release_common.search(version) if match: return match.group(2) - if version.startswith("release-trunk-") or version == "trunk": + if version.startswith("release-trunk-") or version in ( + "trunk", + "trunk-weekly", + ): return "master"