diff options
author | Zakhar Kleyman <zakhar.kleyman@mongodb.com> | 2020-09-02 14:33:58 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-09-03 18:52:59 +0000 |
commit | 39c200878284912f19553901a6fea4b31531a899 (patch) | |
tree | 60cbdb7d0f1e798466d3a8e10e9caa0240202cd6 | |
parent | 91563e0f58c8e3e2e3473283a5c14a3abc4bc25c (diff) | |
download | mongo-39c200878284912f19553901a6fea4b31531a899.tar.gz |
SERVER-33000 Add Ubuntu 18.04 supportr3.6.20-rc2r3.6.20
-rw-r--r-- | buildscripts/package_test/.kitchen.yml | 5 | ||||
-rw-r--r-- | buildscripts/package_test/recipes/install_mongodb.rb | 2 | ||||
-rw-r--r-- | buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb | 18 | ||||
-rwxr-xr-x | buildscripts/packager.py | 4 | ||||
-rw-r--r-- | etc/evergreen.yml | 151 | ||||
-rw-r--r-- | etc/repo_config.yaml | 24 |
6 files changed, 198 insertions, 6 deletions
diff --git a/buildscripts/package_test/.kitchen.yml b/buildscripts/package_test/.kitchen.yml index 21d67e02ac7..5fa7b84763b 100644 --- a/buildscripts/package_test/.kitchen.yml +++ b/buildscripts/package_test/.kitchen.yml @@ -81,6 +81,11 @@ platforms: image_id: ami-64140d0e transport: username: ubuntu + - name: ubuntu1804 + driver: + image_id: ami-7ad76705 + transport: + username: ubuntu transport: ssh_key: ~/.ssh/kitchen.pem diff --git a/buildscripts/package_test/recipes/install_mongodb.rb b/buildscripts/package_test/recipes/install_mongodb.rb index 7625f5bf359..5f4304e7f25 100644 --- a/buildscripts/package_test/recipes/install_mongodb.rb +++ b/buildscripts/package_test/recipes/install_mongodb.rb @@ -29,6 +29,8 @@ end if platform_family? 'debian' + ENV['DEBIAN_FRONTEND'] = 'noninteractive' + execute 'apt-get update' do command 'apt-get update' end 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 9788647bdfb..5049b39396b 100644 --- a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb +++ b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb @@ -111,6 +111,7 @@ if rpm end end + describe user('mongod') do it { should exist } its('groups') { should include 'mongod' } @@ -124,10 +125,19 @@ if deb it { should be_directory } end - describe user('mongodb') do - it { should exist } - its('groups') { should include 'mongodb' } - its('shell') { should eq '/bin/false' } + if os[:release] == '18.04' + describe user('mongodb') do + it { should exist } + its('groups') { should include 'mongodb' } + its('shell') { should eq '/usr/sbin/nologin' } + end + else + describe user('mongod') do + it { should exist } + its('groups') { should include 'mongod' } + its('home') { should eq '/var/lib/mongo' } + its('shell') { should eq '/bin/false' } + end end end diff --git a/buildscripts/packager.py b/buildscripts/packager.py index e3ee56401df..06040a98257 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -255,6 +255,8 @@ class Distro(object): return "trusty" elif build_os == 'ubuntu1604': return "xenial" + elif build_os == 'ubuntu1804': + return "bionic" else: raise Exception("unsupported build_os: %s" % build_os) elif self.n == 'debian': @@ -289,7 +291,7 @@ class Distro(object): elif self.n == 'amazon': return [ "amazon" ] elif self.n == 'ubuntu': - return [ "ubuntu1204", "ubuntu1404", "ubuntu1604", ] + return [ "ubuntu1204", "ubuntu1404", "ubuntu1604", "ubuntu1804"] elif self.n == 'debian': return [ "debian81", "debian92" ] else: diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 02010fde18c..b0890cd83d2 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -8705,6 +8705,156 @@ buildvariants: distros: - ubuntu1604-build +- name: ubuntu1804 + display_name: SSL Ubuntu 18.04 + run_on: + - ubuntu1804-test + batchtime: 1440 # 1 day + expansions: + push_path: linux + push_bucket: downloads.mongodb.org + push_name: linux + push_arch: x86_64-ubuntu1804 + lang_environment: LANG=C + compile_flags: --ssl MONGO_DISTMOD=ubuntu1804 -j$(grep -c ^processor /proc/cpuinfo) --release --variables-files=etc/scons/mongodbtoolchain_gcc.vars + multiversion_platform: ubuntu1804 + multiversion_edition: targeted + num_jobs_available: $(grep -c ^processor /proc/cpuinfo) + has_packages: true + packager_script: packager.py + packager_arch: x86_64 + packager_distro: ubuntu1804 + repo_edition: org + use_scons_cache: true + tooltags: "ssl" + build_mongoreplay: true + tasks: + - name: compile + distros: + - ubuntu1804-build + - name: compile_all + distros: + - ubuntu1804-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: noPassthrough_WT + - name: noPassthroughWithMongod_WT + - name: bulk_gle_passthrough_WT + - name: parallel_WT + - name: parallel_compatibility_WT + - name: concurrency_WT + - name: concurrency_replication_WT + - name: concurrency_sharded_WT + - name: concurrency_simultaneous_WT + - 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: sharding_last_stable_mongos_and_mixed_shards + - name: slow1_WT + - name: serial_run_WT + - name: sharding_jscore_passthrough_WT + - name: ssl + - name: sslSpecial + - name: tool_WT + - name: package + distros: + - ubuntu1604-packer + - name: push + distros: + - ubuntu1804-small + +- name: enterprise-ubuntu1804-64 + display_name: Enterprise Ubuntu 18.04 + modules: + - enterprise + run_on: + - ubuntu1804-test + batchtime: 1440 # 1 day + expansions: + push_path: linux + push_bucket: downloads.10gen.com + push_name: linux + lang_environment: LANG=C + push_arch: x86_64-enterprise-ubuntu1804 + compile_flags: --ssl MONGO_DISTMOD=ubuntu1804 --release -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_gcc.vars + num_jobs_available: $(grep -c ^processor /proc/cpuinfo) + has_packages: true + packager_script: packager-enterprise.py + packager_arch: x86_64 + packager_distro: ubuntu1804 + repo_edition: enterprise + use_scons_cache: true + tooltags: "ssl sasl" + build_mongoreplay: true + tasks: + - name: compile + distros: + - ubuntu1804-build + - name: compile_all + distros: + - ubuntu1804-build + - name: audit_WT + - name: dbtest_WT + - name: ese_WT + - name: jsCore # TODO SERVER-32036: Replace with jsCore_WT when jsCore_auth depends on jsCore_WT. + - 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: replica_sets_auth + - name: sasl + - name: sharding_auth + - name: snmp_WT + - name: ssl + - name: sslSpecial + - name: watchdog + - name: watchdog_inmemory + - name: watchdog_WT + - name: package + distros: + - ubuntu1604-packer + - name: push + distros: + - ubuntu1804-small + + ########################################### # SUSE buildvariants # ########################################### @@ -8839,7 +8989,6 @@ buildvariants: - name: master_slave_jscore_passthrough_WT - name: sharding_WT - name: sharding_auth - - name: sharding_last_stable_mongos_and_mixed_shards - name: slow1_WT - name: serial_run_WT - name: sharding_jscore_passthrough_WT diff --git a/etc/repo_config.yaml b/etc/repo_config.yaml index d99227641ad..c7f4ef16ed5 100644 --- a/etc/repo_config.yaml +++ b/etc/repo_config.yaml @@ -171,6 +171,18 @@ repos: repos: - apt/ubuntu/dists/xenial/mongodb-org + - name: ubuntu1804 + type: deb + code_name: "bionic" + edition: org + bucket: repo.mongodb.org + component: multiverse + architectures: + - amd64 + - i386 + repos: + - apt/ubuntu/dists/bionic/mongodb-org + #################### # # Enterprise Repos: @@ -313,3 +325,15 @@ repos: - i386 repos: - apt/ubuntu/dists/xenial/mongodb-enterprise + + - name: ubuntu1804 + type: deb + code_name: "bionic" + edition: enterprise + bucket: repo.mongodb.com + component: multiverse + architectures: + - amd64 + - i386 + repos: + - apt/ubuntu/dists/bionic/mongodb-enterprise
\ No newline at end of file |