SERVER-44070 Platform Support: Add Community & Enterprise Ubuntu 20.0…

…4 x64
Crescentek · Apr 29, 2020 · a7653f2 · a7653f2
1 parent ab21bf5
commit a7653f2
Show file tree

Hide file tree

Showing 5 changed files with 142 additions and 1 deletion.
diff --git 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
@@ -151,7 +151,8 @@
     # 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
@@ -293,6 +293,8 @@ def repo_os_version(self, build_os):  # pylint: disable=too-many-branches
                 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 @@ def build_os(self, arch):
                 "ubuntu1404",
                 "ubuntu1604",
                 "ubuntu1804",
+                "ubuntu2004",
             ]
         elif self.dname == 'debian':
             return ["debian81", "debian92", "debian10"]

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
@@ -370,6 +370,7 @@ variables:
   - enterprise-ubuntu1804-arm64
   - enterprise-ubuntu1804-ppc64le
   - enterprise-ubuntu1804-s390x
+  - enterprise-ubuntu2004-64
   - enterprise-windows
   - enterprise-windows-compile-all
   - enterprise-windows-debug-unoptimized
@@ -436,10 +437,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
 
@@ -9268,6 +9271,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
@@ -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