summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian McCarthy <brian.mccarthy@mongodb.com>2020-04-24 19:51:05 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-05-04 21:24:06 +0000
commit11fd7943b2cc29c189ddd919a21677d4ce50a933 (patch)
treef258383afbe79df1e5d6b1203842ce8d3a8301c8
parent37dd62061cd41843646ab5b3eb91f29716117196 (diff)
downloadmongo-11fd7943b2cc29c189ddd919a21677d4ce50a933.tar.gz
SERVER-44070 Platform Support: Add Community & Enterprise Ubuntu 20.04 x64
(cherry picked from commit a7653f2540a79cbbdb313a0c13be501fadc30878)
-rw-r--r--buildscripts/package_test/.kitchen.yml5
-rw-r--r--buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb3
-rwxr-xr-xbuildscripts/packager.py3
-rw-r--r--etc/evergreen.yml105
-rw-r--r--etc/repo_config.yaml27
5 files changed, 142 insertions, 1 deletions
diff --git a/buildscripts/package_test/.kitchen.yml b/buildscripts/package_test/.kitchen.yml
index d9e6a41d5f1..66ac4488f8c 100644
--- a/buildscripts/package_test/.kitchen.yml
+++ b/buildscripts/package_test/.kitchen.yml
@@ -105,6 +105,11 @@ platforms:
image_id: ami-7ad76705
transport:
username: ubuntu
+ - name: ubuntu2004
+ driver:
+ image_id: ami-068663a3c619dd892
+ transport:
+ username: ubuntu
transport:
ssh_key: ~/.ssh/kitchen.pem
diff --git a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
index be53465b0c1..f5cc9799569 100644
--- a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
+++ b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
@@ -151,7 +151,8 @@ if deb
# account shells
its('shell') {
if ((os[:name] == 'debian' and os[:release].split('.')[0] == '10') or
- (os[:name] == 'ubuntu' and os[:release] == '18.04'))
+ (os[:name] == 'ubuntu' and os[:release] == '18.04') or
+ (os[:name] == 'ubuntu' and os[:release] == '20.04'))
should eq '/usr/sbin/nologin'
else
should eq '/bin/false'
diff --git a/buildscripts/packager.py b/buildscripts/packager.py
index 53ae83c6c10..da64402d347 100755
--- a/buildscripts/packager.py
+++ b/buildscripts/packager.py
@@ -293,6 +293,8 @@ class Distro(object):
return "xenial"
elif build_os == 'ubuntu1804':
return "bionic"
+ elif build_os == 'ubuntu2004':
+ return "focal"
else:
raise Exception("unsupported build_os: %s" % build_os)
elif self.dname == 'debian':
@@ -339,6 +341,7 @@ class Distro(object):
"ubuntu1404",
"ubuntu1604",
"ubuntu1804",
+ "ubuntu2004",
]
elif self.dname == 'debian':
return ["debian81", "debian92", "debian10"]
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index ecac3d29dc4..87064a04a70 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -367,6 +367,7 @@ variables:
- enterprise-ubuntu1804-arm64
- enterprise-ubuntu1804-ppc64le
- enterprise-ubuntu1804-s390x
+ - enterprise-ubuntu2004-64
- enterprise-windows
- enterprise-windows-compile-all
- enterprise-windows-debug-unoptimized
@@ -430,10 +431,12 @@ variables:
- ubuntu1804
- ubuntu1804-arm64
- ubuntu1804-s390x
+ - ubuntu2004
- enterprise-ubuntu1804-64
- enterprise-ubuntu1804-arm64
- enterprise-ubuntu1804-ppc64le
- enterprise-ubuntu1804-s390x
+ - enterprise-ubuntu2004-64
- enterprise-windows
- windows
@@ -9073,6 +9076,108 @@ buildvariants:
distros:
- ubuntu1804-test
+- name: ubuntu2004
+ display_name: Ubuntu 20.04
+ run_on:
+ - ubuntu2004-small
+ expansions:
+ push_path: linux
+ push_bucket: downloads.mongodb.org
+ push_name: linux
+ push_arch: x86_64-ubuntu2004
+ compile_flags: --ssl MONGO_DISTMOD=ubuntu2004 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
+ multiversion_platform: ubuntu2004
+ multiversion_edition: targeted
+ has_packages: true
+ packager_script: packager.py
+ packager_arch: x86_64
+ packager_distro: ubuntu2004
+ repo_edition: org
+ scons_cache_scope: shared
+ tasks:
+ - name: compile_all_run_unittests_TG
+ distros:
+ - ubuntu2004-large
+ - name: .aggfuzzer .common !.multiversion
+ - name: aggregation
+ - name: .auth !.audit !.multiversion
+ - name: .misc_js
+ - name: .concurrency .common
+ - name: concurrency_replication_causal_consistency
+ distros:
+ - ubuntu2004-large
+ - name: disk_wiredtiger
+ - name: free_monitoring
+ - name: .jscore .common
+ - name: .jstestfuzz .common
+ - name: libunwind_tests
+ - name: .logical_session_cache .one_sec
+ # - name: multiversion_gen
+ - name: replica_sets
+ - name: replica_sets_jscore_passthrough
+ - name: .sharding .txns
+ - name: sharding_gen
+ - name: sharding_jscore_passthrough
+ - name: .ssl
+ - name: .stitch
+ - name: test_packages
+ distros:
+ - ubuntu1604-packer
+ - name: .publish
+ distros:
+ - ubuntu2004-small
+
+- name: enterprise-ubuntu2004-64
+ display_name: Enterprise Ubuntu 20.04
+ modules:
+ - enterprise
+ run_on:
+ - ubuntu2004-small
+ stepback: false
+ expansions:
+ additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug
+ push_path: linux
+ push_bucket: downloads.10gen.com
+ push_name: linux
+ push_arch: x86_64-enterprise-ubuntu2004
+ compile_flags: --ssl MONGO_DISTMOD=ubuntu2004 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
+ multiversion_platform: ubuntu2004
+ multiversion_edition: enterprise
+ has_packages: true
+ packager_script: packager_enterprise.py
+ packager_arch: x86_64
+ packager_distro: ubuntu2004
+ repo_edition: enterprise
+ scons_cache_scope: shared
+ tasks:
+ - name: compile_all_run_unittests_TG
+ distros:
+ - ubuntu2004-large
+ - name: compile_ninja_TG
+ - name: .aggfuzzer .common !.multiversion
+ - name: audit
+ - name: causally_consistent_jscore_txns_passthrough
+ - name: .encrypt !.aggregation !.replica_sets !.sharding !.jscore
+ - name: external_auth
+ - name: external_auth_aws
+ - name: .jscore .common !.compat !.decimal !.sharding
+ - name: jsCore_auth
+ - name: .jstestfuzz .common
+ - name: libunwind_tests
+ - name: .logical_session_cache .one_sec
+ - name: .ocsp
+ - name: replica_sets_auth_gen
+ - name: replica_sets_jscore_passthrough
+ - name: sasl
+ - name: sharding_auth_gen
+ - name: snmp
+ - name: test_packages
+ distros:
+ - ubuntu1604-packer
+ - name: .publish
+ distros:
+ - ubuntu2004-small
+
- name: enterprise-linux-64-amazon-ami
display_name: "Enterprise Amazon Linux"
modules:
diff --git a/etc/repo_config.yaml b/etc/repo_config.yaml
index bcf8dde1ad6..fd8264e75e9 100644
--- a/etc/repo_config.yaml
+++ b/etc/repo_config.yaml
@@ -238,6 +238,19 @@ repos:
repos:
- apt/ubuntu/dists/bionic/mongodb-org
+ - name: ubuntu2004
+ type: deb
+ code_name: "focal"
+ edition: org
+ bucket: repo.mongodb.org
+ component: multiverse
+ architectures:
+ - amd64
+ - s390x
+ - arm64
+ repos:
+ - apt/ubuntu/dists/bionic/mongodb-org
+
####################
#
# Enterprise Repos:
@@ -434,3 +447,17 @@ repos:
- arm64
repos:
- apt/ubuntu/dists/bionic/mongodb-enterprise
+
+ - name: ubuntu2004
+ type: deb
+ code_name: "focal"
+ edition: enterprise
+ bucket: repo.mongodb.com
+ component: multiverse
+ architectures:
+ - amd64
+ - ppc64el
+ - s390x
+ - arm64
+ repos:
+ - apt/ubuntu/dists/bionic/mongodb-enterprise