diff options
| author | John Chen <john.chen@mongodb.com> | 2019-12-02 17:08:44 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2019-12-02 17:08:44 +0000 |
| commit | 76dc06194037bee31b6eedb168f553be354b1a3c (patch) | |
| tree | 257a2c3cbd20dd62c6f9d6d9acda31741109f708 /buildscripts | |
| parent | 06c8454002da4ca1abc312755b5a3946a75b4e13 (diff) | |
| download | mongo-76dc06194037bee31b6eedb168f553be354b1a3c.tar.gz | |
SERVER-37772 adding RHEL80 distro
(cherry picked from commit 284630e3704be4be091154c5b7fe63c335e9d70c)
(cherry picked from commit 8ce96274a25466e71d4ddc8fb3f92658a4b353b4)
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/package_test/.kitchen.yml | 5 | ||||
| -rwxr-xr-x | buildscripts/packager-enterprise.py | 4 | ||||
| -rwxr-xr-x | buildscripts/packager.py | 10 |
3 files changed, 10 insertions, 9 deletions
diff --git a/buildscripts/package_test/.kitchen.yml b/buildscripts/package_test/.kitchen.yml index 08c143d22e6..b3dec96ed73 100644 --- a/buildscripts/package_test/.kitchen.yml +++ b/buildscripts/package_test/.kitchen.yml @@ -50,6 +50,11 @@ platforms: image_id: ami-60a1e808 transport: username: root + - name: rhel80 + driver: + image_id: ami-0c322300a1dd5dc79 + transport: + username: ec2-user - name: suse11 driver: image_id: ami-7f2e6015 diff --git a/buildscripts/packager-enterprise.py b/buildscripts/packager-enterprise.py index 50d54f83489..58862bc350f 100755 --- a/buildscripts/packager-enterprise.py +++ b/buildscripts/packager-enterprise.py @@ -106,7 +106,7 @@ class EnterpriseDistro(packager.Distro): raise Exception("BUG: unsupported platform?") def build_os(self, arch): - """Return the build os label in the binary package to download ("rhel57", "rhel62", "rhel67" and "rhel70" + """Return the build os label in the binary package to download ("rhel57", "rhel62", "rhel67", "rhel70" and "rhel80" for redhat, the others are delegated to the super class """ if arch == "ppc64le": @@ -132,7 +132,7 @@ class EnterpriseDistro(packager.Distro): return [] if re.search("(redhat|fedora|centos)", self.n): - return [ "rhel70", "rhel62", "rhel57" ] + return [ "rhel80", "rhel70", "rhel62", "rhel57" ] else: return super(EnterpriseDistro, self).build_os(arch) diff --git a/buildscripts/packager.py b/buildscripts/packager.py index 8121d7b8601..e3ee56401df 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -285,7 +285,7 @@ class Distro(object): if re.search("(suse)", self.n): return [ "suse11", "suse12" ] elif re.search("(redhat|fedora|centos)", self.n): - return [ "rhel70", "rhel71", "rhel72", "rhel62", "rhel55" ] + return [ "rhel80", "rhel70", "rhel71", "rhel72", "rhel62", "rhel55" ] elif self.n == 'amazon': return [ "amazon" ] elif self.n == 'ubuntu': @@ -730,12 +730,8 @@ def make_rpm(distro, build_os, arch, spec, srcdir): # Versions of RPM after 4.4 ignore our BuildRoot tag so we need to # specify it on the command line args to rpmbuild - # - # Current versions of RHEL at the time of this writing (RHEL < 8) patch in - # the old behavior so that our BuildRoot tag still works on these versions. - # - # Probably need to add RHEL 8 to this when we start building for it - if distro.name() == "suse" and distro.repo_os_version(build_os) == "15": + if ((distro.name() == "suse" and distro.repo_os_version(build_os) == "15") + or (distro.name() == "redhat" and distro.repo_os_version(build_os) == "8")): flags.extend([ "--buildroot", os.path.join(topdir, "BUILDROOT"), ]) |