Skip to content

Commit fe2a0c1

Browse files
ajdavisajdavis
committed
CDRIVER-2617 only test RHEL on zSeries
Also, start testing MongoDB 4.0 on zSeries, CDRIVER-2686.
1 parent 6207df1 commit fe2a0c1

File tree

3 files changed

+11
-111
lines changed

3 files changed

+11
-111
lines changed

‎.evergreen/config.yml

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9471,7 +9471,7 @@ buildvariants:
94719471
- "test-dns-openssl"
94729472

94739473
- name: zseries-rhel72
9474-
display_name: "*zSeries (s390x) (RHEL 7.2)"
9474+
display_name: "*zSeries"
94759475
expansions:
94769476
CC: "gcc"
94779477
batchtime: 1440 # 1 day
@@ -9485,51 +9485,8 @@ buildvariants:
94859485
- ".debug-compile !.sspi .nossl"
94869486
- ".authentication-tests .openssl"
94879487
- ".latest .openssl !.nosasl .server"
9488-
- ".latest .nossl"
9489-
# TODO CDRIVER-2686: test MongoDB 4 once it's built for zseries
9490-
- ".3.6 .openssl !.nosasl .server"
9491-
# RHEL7.2 s390x is only supported by MongoDB 3.4+
9492-
9493-
- name: zseries-ubuntu1604
9494-
display_name: "zSeries (s390x) (Ubuntu 16.04)"
9495-
expansions:
9496-
CC: "gcc"
9497-
batchtime: 1440 # 1 day
9498-
run_on:
9499-
- ubuntu1604-zseries-large
9500-
tasks:
9501-
- "debug-compile-coverage"
9502-
- "release-compile"
9503-
- "debug-compile"
9504-
- ".debug-compile !.sspi .openssl"
9505-
- ".debug-compile !.sspi .nossl"
9506-
- ".authentication-tests .openssl"
9507-
- ".latest .openssl !.nosasl .server"
9508-
- ".latest .nossl"
9509-
# TODO CDRIVER-2686: test MongoDB 4 once it's built for zseries
9510-
- ".3.6 .openssl !.nosasl .server"
9511-
# Ubuntu16.04 s390x is only supported by MongoDB 3.4+
9512-
- "test-dns-openssl"
9513-
9514-
- name: zseries-suse12
9515-
display_name: "zSeries (s390x) SUSE12"
9516-
expansions:
9517-
CC: "gcc"
9518-
batchtime: 1440 # 1 day
9519-
run_on:
9520-
- suse12-zseries-test
9521-
tasks:
9522-
- ".compression !.snappy"
9523-
- "release-compile"
9524-
- "debug-compile"
9525-
- ".debug-compile !.sspi .openssl"
9526-
- ".debug-compile !.sspi .nossl"
9527-
- ".authentication-tests .openssl"
9528-
- ".latest .openssl !.nosasl .server"
9529-
- ".latest .nossl"
9530-
# TODO CDRIVER-2686: test MongoDB 4 once it's built for zseries
9531-
- ".3.6 .openssl !.nosasl .server"
9532-
# SUSE12 s390x is only supported by MongoDB 3.4+
9488+
- ".latest .nossl .server"
9489+
- ".4.0 .openssl !.nosasl .server"
95339490

95349491
- name: valgrind-ubuntu
95359492
display_name: "Valgrind Tests (Ubuntu 14.04)"

‎.evergreen/download-mongodb.sh

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,15 @@ get_mongodb_download_url_for ()
6262
MONGODB_32="http://downloads.10gen.com/osx/mongodb-osx-x86_64-enterprise-${VERSION_32}.tgz"
6363
MONGODB_30="https://fastdl.mongodb.org/osx/mongodb-osx-x86_64-${VERSION_30}.tgz"
6464
;;
65-
linux-rhel-7.*-s390x)
65+
linux-rhel-7*-s390x)
6666
MONGODB_LATEST="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-rhel72-latest.tgz"
67-
MONGODB_40="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-rhel72-${VERSION_40}.tgz"
68-
MONGODB_36="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-rhel72-3.6.1.tgz"
69-
MONGODB_34="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-rhel72-${VERSION_34}.tgz"
67+
MONGODB_40="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-rhel72-v4.0-latest.tgz"
68+
MONGODB_36="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-rhel72-3.6.4.tgz"
69+
MONGODB_34="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-rhel72-3.4.14.tgz"
7070
MONGODB_32=""
7171
MONGODB_30=""
72+
MONGODB_26=""
73+
MONGODB_24=""
7274
;;
7375
linux-rhel-7.*-ppc64le)
7476
MONGODB_LATEST="http://downloads.10gen.com/linux/mongodb-linux-ppc64le-enterprise-rhel71-latest.tgz"
@@ -102,14 +104,6 @@ get_mongodb_download_url_for ()
102104
MONGODB_32="http://downloads.mongodb.org/linux/mongodb-linux-x86_64-rhel55-${VERSION_32}.tgz"
103105
MONGODB_30="http://downloads.mongodb.org/linux/mongodb-linux-x86_64-rhel55-${VERSION_30}.tgz"
104106
;;
105-
linux-sles-12.*-s390x)
106-
MONGODB_LATEST="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-suse12-latest.tgz"
107-
MONGODB_40="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-suse12-${VERSION_40}.tgz"
108-
MONGODB_36="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-suse12-3.6.3.tgz"
109-
MONGODB_34="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-suse12-${VERSION_34}.tgz"
110-
MONGODB_32=""
111-
MONGODB_30=""
112-
;;
113107
linux-debian-8*)
114108
MONGODB_LATEST="http://downloads.10gen.com/linux/mongodb-linux-x86_64-enterprise-debian81-latest.tgz"
115109
MONGODB_40="http://downloads.10gen.com/linux/mongodb-linux-x86_64-enterprise-debian81-${VERSION_40}.tgz"
@@ -118,14 +112,6 @@ get_mongodb_download_url_for ()
118112
MONGODB_32=""
119113
MONGODB_30=""
120114
;;
121-
linux-ubuntu-16.04-s390x)
122-
MONGODB_LATEST="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-ubuntu1604-latest.tgz"
123-
MONGODB_40="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-ubuntu1604-${VERSION_40}.tgz"
124-
MONGODB_36="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-ubuntu1604-3.6.4.tgz"
125-
MONGODB_34="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-ubuntu1604-${VERSION_34}.tgz"
126-
MONGODB_32=""
127-
MONGODB_30=""
128-
;;
129115
linux-ubuntu-16.04-ppc64le)
130116
MONGODB_LATEST="http://downloads.10gen.com/linux/mongodb-linux-ppc64le-enterprise-ubuntu1604-latest.tgz"
131117
MONGODB_40="http://downloads.10gen.com/linux/mongodb-linux-ppc64le-enterprise-ubuntu1604-${VERSION_40}.tgz"

‎build/config.yml.template

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,7 +2261,7 @@ buildvariants:
22612261
- "test-dns-openssl"
22622262

22632263
- name: zseries-rhel72
2264-
display_name: "*zSeries (s390x) (RHEL 7.2)"
2264+
display_name: "*zSeries"
22652265
expansions:
22662266
CC: "gcc"
22672267
batchtime: 1440 # 1 day
@@ -2276,50 +2276,7 @@ buildvariants:
22762276
- ".authentication-tests .openssl"
22772277
- ".latest .openssl !.nosasl .server"
22782278
- ".latest .nossl"
2279-
# TODO CDRIVER-2686: test MongoDB 4 once it's built for zseries
2280-
- ".3.6 .openssl !.nosasl .server"
2281-
# RHEL7.2 s390x is only supported by MongoDB 3.4+
2282-
2283-
- name: zseries-ubuntu1604
2284-
display_name: "zSeries (s390x) (Ubuntu 16.04)"
2285-
expansions:
2286-
CC: "gcc"
2287-
batchtime: 1440 # 1 day
2288-
run_on:
2289-
- ubuntu1604-zseries-large
2290-
tasks:
2291-
- "debug-compile-coverage"
2292-
- "release-compile"
2293-
- "debug-compile"
2294-
- ".debug-compile !.sspi .openssl"
2295-
- ".debug-compile !.sspi .nossl"
2296-
- ".authentication-tests .openssl"
2297-
- ".latest .openssl !.nosasl .server"
2298-
- ".latest .nossl"
2299-
# TODO CDRIVER-2686: test MongoDB 4 once it's built for zseries
2300-
- ".3.6 .openssl !.nosasl .server"
2301-
# Ubuntu16.04 s390x is only supported by MongoDB 3.4+
2302-
- "test-dns-openssl"
2303-
2304-
- name: zseries-suse12
2305-
display_name: "zSeries (s390x) SUSE12"
2306-
expansions:
2307-
CC: "gcc"
2308-
batchtime: 1440 # 1 day
2309-
run_on:
2310-
- suse12-zseries-test
2311-
tasks:
2312-
- ".compression !.snappy"
2313-
- "release-compile"
2314-
- "debug-compile"
2315-
- ".debug-compile !.sspi .openssl"
2316-
- ".debug-compile !.sspi .nossl"
2317-
- ".authentication-tests .openssl"
2318-
- ".latest .openssl !.nosasl .server"
2319-
- ".latest .nossl"
2320-
# TODO CDRIVER-2686: test MongoDB 4 once it's built for zseries
2321-
- ".3.6 .openssl !.nosasl .server"
2322-
# SUSE12 s390x is only supported by MongoDB 3.4+
2279+
- ".4.0 .openssl !.nosasl .server"
23232280

23242281
- name: valgrind-ubuntu
23252282
display_name: "Valgrind Tests (Ubuntu 14.04)"

0 commit comments

Comments
 (0)