Skip to content

Commit 9811b7a

Browse files
author
Sam Kleinman
committed
SERVER-23043: support for ubuntu1604 community and enterprise builds
1 parent 6369be9 commit 9811b7a

File tree

2 files changed

+175
-7
lines changed

2 files changed

+175
-7
lines changed

‎buildscripts/packager.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ def repo_os_version(self, build_os):
223223
return "precise"
224224
elif build_os == 'ubuntu1404':
225225
return "trusty"
226-
elif build_os == 'ubuntu1504':
227-
return "vivid"
226+
elif build_os == 'ubuntu1604':
227+
return "xenial"
228228
else:
229229
raise Exception("unsupported build_os: %s" % build_os)
230230
elif self.n == 'debian':
@@ -259,7 +259,7 @@ def build_os(self, arch):
259259
elif self.n == 'amazon':
260260
return [ "amazon" ]
261261
elif self.n == 'ubuntu':
262-
return [ "ubuntu1204", "ubuntu1404" ]
262+
return [ "ubuntu1204", "ubuntu1404", "ubuntu1604", ]
263263
elif self.n == 'debian':
264264
return [ "debian71", "debian81" ]
265265
else:

‎etc/evergreen.yml‎

Lines changed: 172 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ variables:
9494
- enterprise-suse12-64
9595
- enterprise-ubuntu1204-64
9696
- enterprise-ubuntu1404-64
97+
- enterprise-ubuntu1604-64
9798
- enterprise-debian71-64
9899
- enterprise-debian81-64
99100
- linux-64
@@ -105,6 +106,7 @@ variables:
105106
- suse12
106107
- ubuntu1204
107108
- ubuntu1404
109+
- ubuntu1604
108110
- ubuntu1404-rocksdb
109111
- ubuntu1410-fast-clang
110112
- debian71
@@ -125,6 +127,7 @@ variables:
125127
- enterprise-suse12-64
126128
- enterprise-ubuntu1204-64
127129
- enterprise-ubuntu1404-64
130+
- enterprise-ubuntu1604-64
128131
- enterprise-debian71-64
129132
- enterprise-debian81-64
130133
- rhel55
@@ -134,6 +137,7 @@ variables:
134137
- suse12
135138
- ubuntu1204
136139
- ubuntu1404
140+
- ubuntu1604
137141
- amazon
138142
- debian71
139143
- debian81
@@ -1981,6 +1985,7 @@ tasks:
19811985
script: |
19821986
set -o errexit
19831987
set -o verbose
1988+
19841989
mv mongo-binaries.tgz mongodb-binaries.${ext|tgz}
19851990
mv mongo-debugsymbols.tgz debugsymbols-*.${ext|tgz} || true
19861991
cp mongodb-*.${ext|tgz} mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}
@@ -3053,6 +3058,117 @@ buildvariants:
30533058
distros:
30543059
- rhel55-test
30553060

3061+
3062+
- name: ubuntu1604
3063+
display_name: SSL Ubuntu 16.04
3064+
modules: ~
3065+
run_on:
3066+
- ubuntu1604-test
3067+
batchtime: 1440 # 1 day
3068+
expansions:
3069+
tooltags: "-tags ssl"
3070+
push_path: linux
3071+
push_bucket: downloads.mongodb.org
3072+
push_name: linux
3073+
push_arch: x86_64-ubuntu1604
3074+
compile_flags: --ssl MONGO_DISTMOD=ubuntu1604 -j$(grep -c ^processor /proc/cpuinfo) --release CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++
3075+
num_jobs_available: $(grep -c ^processor /proc/cpuinfo)
3076+
has_packages: true
3077+
packager_script: packager.py
3078+
packager_arch: x86_64
3079+
packager_distro: ubuntu1604
3080+
tasks:
3081+
- name: compile
3082+
distros:
3083+
- ubuntu1604-build
3084+
- name: aggregation
3085+
- name: aggregation_WT
3086+
- name: aggregation_auth
3087+
- name: auth
3088+
- name: auth_WT
3089+
- name: dbtest
3090+
- name: dbtest_WT
3091+
- name: disk
3092+
- name: durability
3093+
- name: dur_jscore_passthrough
3094+
- name: failpoints
3095+
- name: failpoints_auth
3096+
- name: gle_auth
3097+
- name: gle_auth_WT
3098+
- name: gle_auth_write_cmd
3099+
- name: gle_auth_write_cmd_WT
3100+
- name: gle_auth_basics_passthrough
3101+
- name: gle_auth_basics_passthrough_WT
3102+
- name: gle_auth_basics_passthrough_write_cmd
3103+
- name: gle_auth_basics_passthrough_write_cmd_WT
3104+
- name: sharding_gle_auth_basics_passthrough
3105+
- name: sharding_gle_auth_basics_passthrough_WT
3106+
- name: sharding_gle_auth_basics_passthrough_write_cmd
3107+
- name: sharding_gle_auth_basics_passthrough_write_cmd_WT
3108+
- name: jsCore
3109+
- name: jsCore_WT
3110+
- name: jsCore_auth
3111+
- name: jsCore_compatibility
3112+
- name: jsCore_compatibility_WT
3113+
- name: jsCore_decimal
3114+
- name: jsCore_decimal_WT
3115+
- name: jsCore_small_oplog
3116+
- name: jsCore_small_oplog_WT
3117+
- name: jsCore_small_oplog_rs
3118+
- name: jsCore_small_oplog_rs_WT
3119+
- name: jstestfuzz
3120+
- name: jstestfuzz_WT
3121+
- name: jstestfuzz_replication
3122+
- name: jstestfuzz_replication_WT
3123+
- name: jstestfuzz_sharded
3124+
- name: jstestfuzz_sharded_WT
3125+
- name: mmap
3126+
- name: mongosTest
3127+
- name: multiversion
3128+
- name: noPassthrough
3129+
- name: noPassthrough_WT
3130+
- name: noPassthroughWithMongod
3131+
- name: noPassthroughWithMongod_WT
3132+
- name: bulk_gle_passthrough
3133+
- name: bulk_gle_passthrough_WT
3134+
- name: parallel
3135+
- name: parallel_WT
3136+
- name: parallel_compatibility
3137+
- name: parallel_compatibility_WT
3138+
- name: concurrency
3139+
- name: concurrency_WT
3140+
- name: concurrency_replication
3141+
- name: concurrency_replication_WT
3142+
- name: concurrency_sharded
3143+
- name: concurrency_sharded_WT
3144+
- name: concurrency_simultaneous
3145+
- name: concurrency_simultaneous_WT
3146+
- name: replicasets
3147+
- name: replicasets_WT
3148+
- name: replicasets_auth
3149+
- name: replication
3150+
- name: replication_WT
3151+
- name: replication_auth
3152+
- name: sharding
3153+
- name: sharding_WT
3154+
- name: sharding_auth
3155+
- name: sharding_last_stable_mongos
3156+
- name: slow1
3157+
- name: slow1_WT
3158+
- name: serial_run
3159+
- name: serial_run_WT
3160+
- name: sharding_jscore_passthrough
3161+
- name: sharding_jscore_passthrough_WT
3162+
- name: ssl
3163+
- name: sslSpecial
3164+
- name: tool
3165+
- name: tool_WT
3166+
- name: unittests
3167+
- name: push
3168+
distros:
3169+
- rhel55-test
3170+
3171+
30563172
- name: enterprise-linux-64-amazon-ami
30573173
display_name: "* Enterprise Amazon Linux"
30583174
modules:
@@ -4975,6 +5091,58 @@ buildvariants:
49755091
distros:
49765092
- rhel55-test
49775093

5094+
- name: enterprise-ubuntu1604-64
5095+
display_name: Enterprise Ubuntu 16.04
5096+
modules:
5097+
- enterprise
5098+
run_on:
5099+
- ubuntu1604-test
5100+
batchtime: 1440 # 1 day
5101+
expansions:
5102+
gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH"
5103+
tooltags: "-tags 'ssl sasl'"
5104+
push_path: linux
5105+
push_bucket: downloads.10gen.com
5106+
push_name: linux
5107+
push_arch: x86_64-enterprise-ubuntu1604
5108+
compile_flags: --ssl MONGO_DISTMOD=ubuntu1604 --release -j$(grep -c ^processor /proc/cpuinfo) CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++
5109+
num_jobs_available: $(grep -c ^processor /proc/cpuinfo)
5110+
has_packages: true
5111+
packager_script: packager-enterprise.py
5112+
packager_arch: x86_64
5113+
packager_distro: ubuntu1604
5114+
tasks:
5115+
- name: compile
5116+
distros:
5117+
- ubuntu1604-build
5118+
- name: audit
5119+
- name: audit_WT
5120+
- name: dbtest
5121+
- name: dbtest_WT
5122+
- name: ese_WT
5123+
- name: jsCore
5124+
- name: jsCore_auth
5125+
- name: jstestfuzz
5126+
- name: jstestfuzz_WT
5127+
- name: jstestfuzz_replication
5128+
- name: jstestfuzz_replication_WT
5129+
- name: jstestfuzz_sharded
5130+
- name: jstestfuzz_sharded_WT
5131+
- name: mmap
5132+
- name: replicasets_auth
5133+
- name: sasl
5134+
- name: sharding_auth
5135+
- name: snmp
5136+
- name: snmp_WT
5137+
- name: ssl
5138+
- name: sslSpecial
5139+
- name: unittests
5140+
- name: push
5141+
distros:
5142+
- rhel55-test
5143+
5144+
5145+
49785146
###########################################
49795147
# SUSE buildvariants #
49805148
###########################################
@@ -6468,19 +6636,19 @@ buildvariants:
64686636
distros:
64696637
- rhel55-test
64706638

6471-
- name: enterprise-ubuntu-dynamic-1404-64-bit
6472-
display_name: "* Shared Library Enterprise Ubuntu 1404"
6639+
- name: enterprise-ubuntu-dynamic-1604-64-bit
6640+
display_name: "* Shared Library Enterprise Ubuntu 16.04"
64736641
modules:
64746642
- enterprise
64756643
expansions:
64766644
gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH"
64776645
tooltags: "-tags 'ssl sasl'"
6478-
compile_flags: --ssl MONGO_DISTMOD=ubuntu1404 -j$(grep -c ^processor /proc/cpuinfo) CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ --link-model=dynamic
6646+
compile_flags: --ssl MONGO_DISTMOD=ubuntu1604 -j$(grep -c ^processor /proc/cpuinfo) CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ --link-model=dynamic
64796647
num_jobs_available: $(grep -c ^processor /proc/cpuinfo)
64806648
tasks:
64816649
- name: compile
64826650
distros:
6483-
- ubuntu1404-build
6651+
- ubuntu1604-build
64846652

64856653
- name: enterprise-debug-rhel-62-cxx14
64866654
display_name: ~ Enterprise RHEL 6.2 C++14 DEBUG

0 commit comments

Comments
 (0)