summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--buildscripts/package_test/.kitchen.yml5
-rwxr-xr-xbuildscripts/packager.py10
-rwxr-xr-xbuildscripts/packager_enterprise.py4
-rw-r--r--etc/evergreen.yml164
-rw-r--r--rpm/mongodb-enterprise-unstable.spec4
-rw-r--r--rpm/mongodb-enterprise.spec4
-rw-r--r--rpm/mongodb-org-unstable.spec4
-rw-r--r--rpm/mongodb-org.spec4
-rwxr-xr-xsrc/mongo/installer/compass/install_compass.in5
9 files changed, 187 insertions, 17 deletions
diff --git a/buildscripts/package_test/.kitchen.yml b/buildscripts/package_test/.kitchen.yml
index b3d87242dde..ac467e3fbaa 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 f6600a4eaff..37997bd4c85 100755
--- a/buildscripts/packager.py
+++ b/buildscripts/packager.py
@@ -331,7 +331,7 @@ class Distro(object):
if re.search("(suse)", self.dname):
return ["suse11", "suse12"]
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':
@@ -840,12 +840,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 fc346c352b7..2e022559224 100755
--- a/buildscripts/packager_enterprise.py
+++ b/buildscripts/packager_enterprise.py
@@ -114,7 +114,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", "rhel80" are for redhat,
the others are delegated to the super class.
"""
# pylint: disable=too-many-return-statements
@@ -138,7 +138,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
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 7db821e33a6..9a33acbabd7 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -338,7 +338,6 @@ variables:
- name: ssl_gen
- name: sslSpecial_gen
-
#######################################
# Functions #
#######################################
@@ -8960,6 +8959,70 @@ 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_all_run_unittests_TG
+ distros:
+ - rhel80-build
+ - name: compile_benchmarks
+ distros:
+ - rhel80-build
+ - name: audit
+ - name: auth_gen
+ - name: auth_audit_gen
+ - name: benchmarks_orphaned
+ - name: benchmarks_sharding
+ - name: ese
+ - name: jsCore
+ - name: jsCore_auth
+ - name: jsCore_txns
+ - name: causally_consistent_jscore_txns_passthrough
+ - name: jstestfuzz_gen
+ - name: jstestfuzz_concurrent_gen
+ - name: jstestfuzz_concurrent_replication_gen
+ - name: jstestfuzz_concurrent_sharded_gen
+ - name: jstestfuzz_replication_gen
+ - name: jstestfuzz_sharded_gen
+ - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
+ - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
+ - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
+ - name: external_auth
+ # Tests disabled by SERVER-44946
+ #- name: replica_sets_auth_gen
+ - name: replica_sets_jscore_passthrough
+ - name: sasl
+ - name: sharding_auth_gen
+ - name: sharding_auth_audit_gen
+ - name: snmp
+ - name: ssl_gen
+ - name: sslSpecial_gen
+ - name: package
+ distros:
+ - ubuntu1604-packer
+ - name: push
+
# This variant is to intentionally test uncommon features nightly
- <<: *enterprise-rhel-70-64-bit-template
name: enterprise-rhel-70-64-bit-kitchen-sink
@@ -9199,6 +9262,105 @@ 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_all_run_unittests_TG
+ distros:
+ - rhel80-build
+ - name: aggregation
+ - name: aggregation_auth
+ - name: auth_gen
+ - name: disk_wiredtiger
+ - name: failpoints
+ - name: failpoints_auth
+ - name: free_monitoring
+ - name: gle_auth
+ - name: gle_auth_write_cmd
+ - name: gle_auth_basics_passthrough
+ - name: gle_auth_basics_passthrough_write_cmd
+ - name: sharding_gle_auth_basics_passthrough
+ - name: sharding_gle_auth_basics_passthrough_write_cmd
+ - name: jsCore
+ - name: jsCore_auth
+ - name: jsCore_compatibility
+ - name: jsCore_decimal
+ - name: jsCore_txns
+ - name: causally_consistent_jscore_txns_passthrough
+ - name: jstestfuzz_gen
+ - name: jstestfuzz_concurrent_gen
+ - name: jstestfuzz_concurrent_replication_gen
+ - name: jstestfuzz_concurrent_sharded_gen
+ - name: jstestfuzz_replication_gen
+ - name: jstestfuzz_sharded_gen
+ - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
+ - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
+ - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
+ - name: mongosTest
+ - name: multiversion
+ - name: noPassthrough_gen
+ - name: noPassthroughWithMongod_gen
+ - name: bulk_gle_passthrough
+ - name: parallel_gen
+ - name: parallel_compatibility
+ - name: concurrency
+ distros:
+ - rhel80-build
+ - name: concurrency_replication
+ distros:
+ - rhel80-build
+ - name: concurrency_replication_causal_consistency
+ distros:
+ - rhel80-build
+ - name: concurrency_replication_multi_stmt_txn
+ distros:
+ - rhel80-build
+ - name: concurrency_sharded_replication
+ distros:
+ - rhel80-build
+ - name: concurrency_sharded_replication_with_balancer
+ distros:
+ - rhel80-build
+ - name: concurrency_simultaneous
+ distros:
+ - rhel80-build
+ # Tests disabled by SERVER-44946
+ #- name: replica_sets
+ #- name: replica_sets_auth_gen
+ - name: replica_sets_jscore_passthrough
+ - name: sharding_gen
+ - name: sharding_auth_gen
+ - name: slow1_gen
+ - name: serial_run
+ - name: sharding_jscore_passthrough
+ - name: sharding_last_stable_mongos_and_mixed_shards_gen
+ - name: ssl_gen
+ - name: sslSpecial_gen
+ - name: tool
+ - 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 d9ed1fddc62..c21e551869a 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 605b232442c..6450779c103 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 8ed7f443303..6897d9ed639 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 3ecab3f26dd..0edabde88d4 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
View Lorry Controller Status