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 | |
parent | 06c8454002da4ca1abc312755b5a3946a75b4e13 (diff) | |
download | mongo-76dc06194037bee31b6eedb168f553be354b1a3c.tar.gz |
SERVER-37772 adding RHEL80 distro
(cherry picked from commit 284630e3704be4be091154c5b7fe63c335e9d70c)
(cherry picked from commit 8ce96274a25466e71d4ddc8fb3f92658a4b353b4)
-rw-r--r-- | buildscripts/package_test/.kitchen.yml | 5 | ||||
-rwxr-xr-x | buildscripts/packager-enterprise.py | 4 | ||||
-rwxr-xr-x | buildscripts/packager.py | 10 | ||||
-rw-r--r-- | etc/evergreen.yml | 152 | ||||
-rw-r--r-- | rpm/mongodb-enterprise-unstable.spec | 4 | ||||
-rw-r--r-- | rpm/mongodb-enterprise.spec | 4 | ||||
-rw-r--r-- | rpm/mongodb-org-unstable.spec | 4 | ||||
-rw-r--r-- | rpm/mongodb-org.spec | 4 | ||||
-rwxr-xr-x | src/mongo/installer/compass/install_compass.in | 5 |
9 files changed, 176 insertions, 16 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"), ]) diff --git a/etc/evergreen.yml b/etc/evergreen.yml index f9f74ee23db..a3f5cb7fc00 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -7955,6 +7955,64 @@ buildvariants: - ubuntu1604-packer - name: push +- 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: logical_session_cache_replication_1sec_refresh_jscore_passthrough + - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough + - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough + - 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: ubuntu1604-debug display_name: "* Ubuntu 16.04 DEBUG" run_on: @@ -8168,6 +8226,100 @@ buildvariants: - ubuntu1604-packer - name: push +- 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: disk_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: logical_session_cache_replication_1sec_refresh_jscore_passthrough_WT + - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_WT + - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_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: enterprise-rhel-71-ppc64le display_name: Enterprise RHEL 7.1 PPC64LE modules: diff --git a/rpm/mongodb-enterprise-unstable.spec b/rpm/mongodb-enterprise-unstable.spec index dfb3f69607a..39bf631ca9f 100644 --- a/rpm/mongodb-enterprise-unstable.spec +++ b/rpm/mongodb-enterprise-unstable.spec @@ -15,8 +15,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if 0%{?suse_version} %define timezone_pkg timezone +%define python_pkg python %else %define timezone_pkg tzdata +%define python_pkg python2 %endif %description @@ -40,7 +42,7 @@ This metapackage will install the mongo shell, import/export tools, other client %package server Summary: MongoDB database server (enterprise) Group: Applications/Databases -Requires: openssl, net-snmp, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi, %{timezone_pkg} +Requires: openssl, net-snmp, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi, %{timezone_pkg}, %{python_pkg} Conflicts: mongo-10gen, mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-shell, mongodb-enterprise-tools, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-shell, mongodb-org-unstable-tools BuildRequires: systemd diff --git a/rpm/mongodb-enterprise.spec b/rpm/mongodb-enterprise.spec index ecb961db7c0..8817da8e274 100644 --- a/rpm/mongodb-enterprise.spec +++ b/rpm/mongodb-enterprise.spec @@ -16,8 +16,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if 0%{?suse_version} %define timezone_pkg timezone +%define python_pkg python %else %define timezone_pkg tzdata +%define python_pkg python2 %endif %description @@ -41,7 +43,7 @@ This metapackage will install the mongo shell, import/export tools, other client %package server Summary: MongoDB database server (enterprise) Group: Applications/Databases -Requires: openssl, net-snmp, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi, %{timezone_pkg} +Requires: openssl, net-snmp, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi, %{timezone_pkg}, %{python_pkg} Conflicts: mongo-10gen, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise-unstable, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-tools, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-shell, mongodb-org-unstable-tools Obsoletes: mongo-10gen-enterprise-server Provides: mongo-10gen-enterprise-server diff --git a/rpm/mongodb-org-unstable.spec b/rpm/mongodb-org-unstable.spec index 6787669cacc..dac44830373 100644 --- a/rpm/mongodb-org-unstable.spec +++ b/rpm/mongodb-org-unstable.spec @@ -14,8 +14,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if 0%{?suse_version} %define timezone_pkg timezone +%define python_pkg python %else %define timezone_pkg tzdata +%define python_pkg python2 %endif %description @@ -39,7 +41,7 @@ This metapackage will install the mongo shell, import/export tools, other client %package server Summary: MongoDB database server Group: Applications/Databases -Requires: openssl, %{timezone_pkg} +Requires: openssl, %{timezone_pkg}, %{python_pkg} Conflicts: mongo-10gen, mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-shell, mongodb-enterprise-tools, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-enterprise-unstable, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-tools %description server diff --git a/rpm/mongodb-org.spec b/rpm/mongodb-org.spec index 3a27385b46e..36619aecc5d 100644 --- a/rpm/mongodb-org.spec +++ b/rpm/mongodb-org.spec @@ -16,8 +16,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if 0%{?suse_version} %define timezone_pkg timezone +%define python_pkg python %else %define timezone_pkg tzdata +%define python_pkg python2 %endif %description @@ -41,7 +43,7 @@ This metapackage will install the mongo shell, import/export tools, other client %package server Summary: MongoDB database server Group: Applications/Databases -Requires: openssl, %{timezone_pkg} +Requires: openssl, %{timezone_pkg}, %{python_pkg} Conflicts: mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-shell, mongodb-enterprise-tools, mongodb-nightly, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-shell, mongodb-org-unstable-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-enterprise-unstable, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-tools Obsoletes: mongo-10gen-server Provides: mongo-10gen-server diff --git a/src/mongo/installer/compass/install_compass.in b/src/mongo/installer/compass/install_compass.in index ddc924759a5..c5215982539 100755 --- a/src/mongo/installer/compass/install_compass.in +++ b/src/mongo/installer/compass/install_compass.in @@ -134,9 +134,8 @@ def is_supported_distro(): if (distro_name == 'Ubuntu' and float(version_number) >= 14.04): return True - if ((distro_name == 'Red Hat Enterprise Linux Server' or - 'CentOS' in distro_name) and - (float(version_number) >= 7.0)): + if (('Red Hat Enterprise Linux' in distro_name or 'CentOS' in distro_name) + and (float(version_number) >= 7.0)): return True return False |