From 725d19e078751ea0a67f34cfe8b4a2e1920ee1dc Mon Sep 17 00:00:00 2001 From: John Chen Date: Wed, 10 Feb 2021 16:34:33 -0500 Subject: [PATCH] SERVER-54073 Add support for -alpha prereleases --- buildscripts/packager.py | 7 +++++-- buildscripts/packager_enterprise.py | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/buildscripts/packager.py b/buildscripts/packager.py index c515301b895..18348a13b7f 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -70,7 +70,7 @@ class Spec(object): def is_rc(self): """Return True if rc.""" - return bool(re.search(r"-rc\d+$", self.version())) + return bool(re.search(r"(-rc|-alpha)\d+$", self.version())) def is_pre_release(self): """Return True if pre-release.""" @@ -103,7 +103,10 @@ class Spec(object): def suffix(self): """Return suffix.""" - return "-org" if int(self.ver.split(".")[1]) % 2 == 0 else "-org-unstable" + if int(self.ver.split(".")[0]) >= 5: + return "-org" if int(self.ver.split(".")[1]) == 0 else "-org-unstable" + else: + return "-org" if int(self.ver.split(".")[1]) % 2 == 0 else "-org-unstable" def prelease(self): """Return pre-release verison suffix.""" diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py index 4bbbfb4b738..cd747c99218 100755 --- a/buildscripts/packager_enterprise.py +++ b/buildscripts/packager_enterprise.py @@ -52,7 +52,10 @@ class EnterpriseSpec(packager.Spec): def suffix(self): """Suffix.""" - return "-enterprise" if int(self.ver.split(".")[1]) % 2 == 0 else "-enterprise-unstable" + if int(self.ver.split(".")[0]) >= 5: + return "-enterprise" if int(self.ver.split(".")[1]) == 0 else "-enterprise-unstable" + else: + return "-enterprise" if int(self.ver.split(".")[1]) % 2 == 0 else "-enterprise-unstable" class EnterpriseDistro(packager.Distro):