TT#15305 build: fix get_common_release for trunk-weekly

Change-Id: Id19002bf24a4416e835d4765e87f9d4b3637b746
pull/7/head
Victor Seva 3 years ago
parent 37fef5f651
commit 753e79f548

@ -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")

@ -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"

Loading…
Cancel
Save