summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer Jackson <spencer.jackson@mongodb.com>2020-01-08 16:00:41 +0000
committerevergreen <evergreen@mongodb.com>2020-01-08 16:00:41 +0000
commit13fb0232005848397d0d87be2b07da004beab2b6 (patch)
tree9a57725e408a1190b627c4d8e63334cd6a23c18d
parentd37c93a281d5d2deb136e4890d730e7e9b3eab0b (diff)
downloadmongo-13fb0232005848397d0d87be2b07da004beab2b6.tar.gz
SERVER-37772 adding RHEL80 distro
(cherry picked from commit 284630e3704be4be091154c5b7fe63c335e9d70c) (cherry picked from commit 8ce96274a25466e71d4ddc8fb3f92658a4b353b4) (cherry picked from commit 76dc06194037bee31b6eedb168f553be354b1a3c)
-rw-r--r--buildscripts/package_test/.kitchen.yml5
-rwxr-xr-xbuildscripts/packager-enterprise.py4
-rwxr-xr-xbuildscripts/packager.py10
-rw-r--r--etc/evergreen.yml146
4 files changed, 156 insertions, 9 deletions
diff --git a/buildscripts/package_test/.kitchen.yml b/buildscripts/package_test/.kitchen.yml
index 3b4a476551c..ba800ac3ef3 100644
--- a/buildscripts/package_test/.kitchen.yml
+++ b/buildscripts/package_test/.kitchen.yml
@@ -46,6 +46,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 7390e8c8d89..3d39cf1638a 100755
--- a/buildscripts/packager-enterprise.py
+++ b/buildscripts/packager-enterprise.py
@@ -101,7 +101,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":
@@ -127,7 +127,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 99f97176531..8693b61cb98 100755
--- a/buildscripts/packager.py
+++ b/buildscripts/packager.py
@@ -283,7 +283,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':
@@ -728,12 +728,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"),
])
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 1a6d2a4a613..f783de565ba 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -5264,6 +5264,61 @@ buildvariants:
- name: ssl
- name: sslSpecial
+- name: enterprise-rhel-80-64-bit
+ display_name: "Enterprise RHEL 8.0"
+ modules:
+ - enterprise
+ run_on:
+ - rhel80-test
+ expansions:
+ push_path: linux
+ push_bucket: downloads.10gen.com
+ push_name: linux
+ push_arch: x86_64-enterprise-rhel80
+ mh_target: dist-mh
+ compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --release --variables-files=etc/scons/mongodbtoolchain_gcc.vars
+ multiversion_platform: rhel80
+ multiversion_edition: enterprise
+ has_packages: true
+ packager_script: packager-enterprise.py
+ packager_arch: x86_64
+ packager_distro: rhel80
+ repo_edition: enterprise
+ scons_cache_scope: shared
+ tooltags: "ssl sasl gssapi"
+ build_mongoreplay: true
+ tasks:
+ - name: compile
+ distros:
+ - rhel80-build
+ - name: compile_all
+ distros:
+ - rhel80-build
+ - name: audit_WT
+ - name: auth_audit_WT
+ - name: dbtest_WT
+ - name: ese_WT
+ - name: jsCore
+ - name: jsCore_auth
+ - name: jstestfuzz_WT
+ - name: jstestfuzz_concurrent_WT
+ - name: jstestfuzz_concurrent_replication_WT
+ - name: jstestfuzz_concurrent_sharded_WT
+ - name: jstestfuzz_replication_WT
+ - name: jstestfuzz_sharded_WT
+ - name: external_auth_WT
+ - name: replica_sets_auth
+ - name: sasl
+ - name: sharding_auth
+ - name: sharding_auth_audit_WT
+ - name: snmp_WT
+ - name: ssl
+ - name: sslSpecial
+ - name: package
+ distros:
+ - ubuntu1604-packer
+ - name: push
+
- name: windows-64-2k8-ssl
display_name: SSL Windows 2008R2
run_on:
@@ -5595,6 +5650,96 @@ buildvariants:
distros:
- rhel70-small
+- name: rhel80
+ display_name: SSL RHEL 8.0
+ run_on:
+ - rhel80-test
+ batchtime: 1440 # 1 day
+ expansions:
+ push_path: linux
+ push_bucket: downloads.mongodb.org
+ push_name: linux
+ push_arch: x86_64-rhel80
+ compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --release --variables-files=etc/scons/mongodbtoolchain_gcc.vars
+ multiversion_platform: rhel80
+ multiversion_edition: targeted
+ has_packages: true
+ packager_script: packager.py
+ packager_arch: x86_64
+ packager_distro: rhel80
+ repo_edition: org
+ scons_cache_scope: shared
+ tooltags: "ssl"
+ build_mongoreplay: true
+ tasks:
+ - name: compile
+ distros:
+ - rhel80-build
+ - name: compile_all
+ distros:
+ - rhel80-build
+ - name: aggregation_WT
+ - name: aggregation_auth
+ - name: auth_WT
+ - name: dbtest_WT
+ - name: failpoints
+ - name: failpoints_auth
+ - name: gle_auth_WT
+ - name: gle_auth_write_cmd_WT
+ - name: gle_auth_basics_passthrough_WT
+ - name: gle_auth_basics_passthrough_write_cmd_WT
+ - name: sharding_gle_auth_basics_passthrough_WT
+ - name: sharding_gle_auth_basics_passthrough_write_cmd_WT
+ - name: jsCore
+ - name: jsCore_WT
+ - name: jsCore_auth
+ - name: jsCore_compatibility_WT
+ - name: jsCore_decimal_WT
+ - name: jstestfuzz_WT
+ - name: jstestfuzz_concurrent_WT
+ - name: jstestfuzz_concurrent_replication_WT
+ - name: jstestfuzz_concurrent_sharded_WT
+ - name: jstestfuzz_replication_WT
+ - name: jstestfuzz_sharded_WT
+ - name: mongosTest
+ - name: multiversion_WT
+ - name: noPassthrough_WT
+ - name: noPassthroughWithMongod_WT
+ - name: bulk_gle_passthrough_WT
+ - name: parallel_WT
+ - name: parallel_compatibility_WT
+ - name: concurrency_WT
+ distros:
+ - rhel80-build
+ - name: concurrency_replication_WT
+ distros:
+ - rhel80-build
+ - name: concurrency_sharded_WT
+ distros:
+ - rhel80-build
+ - name: concurrency_simultaneous_WT
+ distros:
+ - rhel80-build
+ - name: replica_sets_WT
+ - name: replica_sets_auth
+ - name: replica_sets_jscore_passthrough_WT
+ - name: master_slave_WT
+ - name: master_slave_auth
+ - name: master_slave_jscore_passthrough_WT
+ - name: sharding_WT
+ - name: sharding_auth
+ - name: slow1_WT
+ - name: serial_run_WT
+ - name: sharding_jscore_passthrough_WT
+ - name: sharding_last_stable_mongos_and_mixed_shards
+ - name: ssl
+ - name: sslSpecial
+ - name: tool_WT
+ - name: package
+ distros:
+ - ubuntu1604-packer
+ - name: push
+
- name: osx-108-debug
display_name: "* OS X 10.8 DEBUG"
run_on:
@@ -5637,6 +5782,7 @@ buildvariants:
- name: enterprise-osx-108
display_name: Enterprise OS X 10.8
+
modules:
- enterprise
run_on: