SERVER-37772 Backport RHEL8 to v4.2

3 files changed, 11 insertions, 10 deletions

diff --git a/buildscripts/package_test/.kitchen.yml b/buildscripts/package_test/.kitchen.yml
index 3dc27c808b3..3ee7b703bda 100644
--- a/buildscripts/package_test/.kitchen.yml
+++ b/buildscripts/package_test/.kitchen.yml
@@ -60,6 +60,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.py b/buildscripts/packager.py
index 6d951d04b4f..582d10aa22d 100755
--- a/buildscripts/packager.py
+++ b/buildscripts/packager.py
@@ -328,7 +328,7 @@ class Distro(object):
         if re.search("(suse)", self.dname):
             return ["suse11", "suse12", "suse15"]
         elif re.search("(redhat|fedora|centos)", self.dname):
-            return ["rhel70", "rhel71", "rhel72", "rhel62", "rhel55", "rhel67"]
+            return ["rhel80", "rhel70", "rhel71", "rhel72", "rhel62", "rhel55", "rhel67"]
         elif self.dname in ['amazon', 'amazon2']:
             return [self.dname]
         elif self.dname == 'ubuntu':
@@ -841,12 +841,8 @@ def make_rpm(distro, build_os, arch, spec, srcdir):  # pylint: disable=too-many-
 
     # 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"),
diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py
index 9fbc2f0031b..9e99d0120d3 100755
--- a/buildscripts/packager_enterprise.py
+++ b/buildscripts/packager_enterprise.py
@@ -116,7 +116,7 @@ class EnterpriseDistro(packager.Distro):
     def build_os(self, arch):  # pylint: disable=too-many-branches
         """Return the build os label in the binary package to download.
 
-        The labels "rhel57", "rhel62", "rhel67" and "rhel70" are for redhat,
+        The labels "rhel57", "rhel62", "rhel67", "rhel70" and "rhel80" are for redhat,
         the others are delegated to the super class.
         """
         # pylint: disable=too-many-return-statements
@@ -128,7 +128,7 @@ class EnterpriseDistro(packager.Distro):
             return []
         if arch == "s390x":
             if self.dname == 'redhat':
-                return ["rhel67", "rhel72"]
+                return ["rhel67", "rhel72", "rhel80"]
             if self.dname == 'suse':
                 return ["suse11", "suse12", "suse15"]
             if self.dname == 'ubuntu':
@@ -140,7 +140,7 @@ class EnterpriseDistro(packager.Distro):
             return []
 
         if re.search("(redhat|fedora|centos)", self.dname):
-            return ["rhel70", "rhel62", "rhel57"]
+            return ["rhel80", "rhel70", "rhel62", "rhel57"]
         return super(EnterpriseDistro, self).build_os(arch)
         # pylint: enable=too-many-return-statements