Skip to content

Commit aa16f1c

Browse files
juliusgeojuliusgeo
authored
PYTHON-3242 Test against MongoDB 6.0 (#940)
1 parent 75685c0 commit aa16f1c

File tree

1 file changed

+94
-13
lines changed

1 file changed

+94
-13
lines changed

‎.evergreen/config.yml‎

Lines changed: 94 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,33 @@ tasks:
12331233
TOPOLOGY: "sharded_cluster"
12341234
- func: "run tests"
12351235

1236+
- name: "test-6.0-standalone"
1237+
tags: ["6.0", "standalone"]
1238+
commands:
1239+
- func: "bootstrap mongo-orchestration"
1240+
vars:
1241+
VERSION: "6.0"
1242+
TOPOLOGY: "server"
1243+
- func: "run tests"
1244+
1245+
- name: "test-6.0-replica_set"
1246+
tags: ["6.0", "replica_set"]
1247+
commands:
1248+
- func: "bootstrap mongo-orchestration"
1249+
vars:
1250+
VERSION: "6.0"
1251+
TOPOLOGY: "replica_set"
1252+
- func: "run tests"
1253+
1254+
- name: "test-6.0-sharded_cluster"
1255+
tags: ["6.0", "sharded_cluster"]
1256+
commands:
1257+
- func: "bootstrap mongo-orchestration"
1258+
vars:
1259+
VERSION: "6.0"
1260+
TOPOLOGY: "sharded_cluster"
1261+
- func: "run tests"
1262+
12361263
- name: "test-latest-standalone"
12371264
tags: ["latest", "standalone"]
12381265
commands:
@@ -1694,6 +1721,22 @@ tasks:
16941721
- func: "run aws auth test with aws EC2 credentials"
16951722
- func: "run aws ECS auth test"
16961723

1724+
- name: "aws-auth-test-6.0"
1725+
commands:
1726+
- func: "bootstrap mongo-orchestration"
1727+
vars:
1728+
AUTH: "auth"
1729+
ORCHESTRATION_FILE: "auth-aws.json"
1730+
TOPOLOGY: "server"
1731+
VERSION: "6.0"
1732+
- func: "add aws auth variables to file"
1733+
- func: "run aws auth test with regular aws credentials"
1734+
- func: "run aws auth test with assume role credentials"
1735+
- func: "run aws auth test with aws credentials as environment variables"
1736+
- func: "run aws auth test with aws credentials and session token as environment variables"
1737+
- func: "run aws auth test with aws EC2 credentials"
1738+
- func: "run aws ECS auth test"
1739+
16971740
- name: "aws-auth-test-latest"
16981741
commands:
16991742
- func: "bootstrap mongo-orchestration"
@@ -1709,6 +1752,21 @@ tasks:
17091752
- func: "run aws auth test with aws credentials and session token as environment variables"
17101753
- func: "run aws auth test with aws EC2 credentials"
17111754
- func: "run aws ECS auth test"
1755+
- name: "aws-auth-test-rapid"
1756+
commands:
1757+
- func: "bootstrap mongo-orchestration"
1758+
vars:
1759+
AUTH: "auth"
1760+
ORCHESTRATION_FILE: "auth-aws.json"
1761+
TOPOLOGY: "server"
1762+
VERSION: "rapid"
1763+
- func: "add aws auth variables to file"
1764+
- func: "run aws auth test with regular aws credentials"
1765+
- func: "run aws auth test with assume role credentials"
1766+
- func: "run aws auth test with aws credentials as environment variables"
1767+
- func: "run aws auth test with aws credentials and session token as environment variables"
1768+
- func: "run aws auth test with aws EC2 credentials"
1769+
- func: "run aws ECS auth test"
17121770

17131771
- name: load-balancer-test
17141772
commands:
@@ -1930,6 +1988,10 @@ axes:
19301988
display_name: "MongoDB 5.0"
19311989
variables:
19321990
VERSION: "5.0"
1991+
- id: "6.0"
1992+
display_name: "MongoDB 6.0"
1993+
variables:
1994+
VERSION: "6.0"
19331995
- id: "latest"
19341996
display_name: "MongoDB latest"
19351997
variables:
@@ -2159,9 +2221,8 @@ buildvariants:
21592221
- awslinux
21602222
auth-ssl: "*"
21612223
display_name: "${platform} ${auth-ssl}"
2162-
tasks: &all-server-versions
2163-
- ".rapid"
2164-
- ".latest"
2224+
tasks:
2225+
- ".6.0"
21652226
- ".5.0"
21662227
- ".4.4"
21672228
- ".4.2"
@@ -2176,8 +2237,8 @@ buildvariants:
21762237
auth-ssl: "*"
21772238
encryption: "*"
21782239
display_name: "Encryption ${platform} ${auth-ssl}"
2179-
tasks: &encryption-server-versions
2180-
- ".latest"
2240+
tasks:
2241+
- ".6.0"
21812242
- ".5.0"
21822243
- ".4.4"
21832244
- ".4.2"
@@ -2222,6 +2283,7 @@ buildvariants:
22222283
display_name: "${platform} ${auth} ${ssl}"
22232284
tasks:
22242285
- ".latest"
2286+
- ".6.0"
22252287
- ".5.0"
22262288
- ".4.4"
22272289
- ".4.2"
@@ -2236,7 +2298,13 @@ buildvariants:
22362298
ssl: "nossl"
22372299
encryption: "*"
22382300
display_name: "Encryption ${platform} ${auth} ${ssl}"
2239-
tasks: *encryption-server-versions
2301+
tasks: &encryption-server-versions
2302+
- ".latest"
2303+
- ".6.0"
2304+
- ".5.0"
2305+
- ".4.4"
2306+
- ".4.2"
2307+
- ".4.0"
22402308

22412309
# Test one server version (4.2) with zSeries, POWER8, and ARM.
22422310
- matrix_name: "test-different-cpu-architectures"
@@ -2257,7 +2325,15 @@ buildvariants:
22572325
auth-ssl: "*"
22582326
coverage: "*"
22592327
display_name: "${python-version} ${platform} ${auth-ssl} ${coverage}"
2260-
tasks: *all-server-versions
2328+
tasks: &all-server-versions
2329+
- ".rapid"
2330+
- ".latest"
2331+
- ".6.0"
2332+
- ".5.0"
2333+
- ".4.4"
2334+
- ".4.2"
2335+
- ".4.0"
2336+
- ".3.6"
22612337

22622338
- matrix_name: "tests-pyopenssl"
22632339
matrix_spec:
@@ -2397,7 +2473,7 @@ buildvariants:
23972473
auth-ssl: "*"
23982474
display_name: "OpenSSL 1.0.2 ${python-version} ${platform} ${auth-ssl}"
23992475
tasks:
2400-
- ".latest"
2476+
- ".5.0"
24012477

24022478
- matrix_name: "tests-windows-encryption"
24032479
matrix_spec:
@@ -2564,7 +2640,7 @@ buildvariants:
25642640
# See https://jira.mongodb.org/browse/SERVER-51364.
25652641
platform: ubuntu-20.04
25662642
python-version: ["3.7", "3.10", "pypy3.7", "pypy3.8"]
2567-
mongodb-version: ["4.4", "5.0", "latest"]
2643+
mongodb-version: ["4.4", "5.0", "6.0", "latest"]
25682644
auth: "noauth"
25692645
ssl: "ssl"
25702646
display_name: "OCSP test ${platform} ${python-version} ${mongodb-version}"
@@ -2576,7 +2652,7 @@ buildvariants:
25762652
matrix_spec:
25772653
platform: windows-64-vsMulti-small
25782654
python-version-windows: ["3.7", "3.10"]
2579-
mongodb-version: ["4.4", "5.0", "latest"]
2655+
mongodb-version: ["4.4", "5.0", "6.0", "latest"]
25802656
auth: "noauth"
25812657
ssl: "ssl"
25822658
display_name: "OCSP test ${platform} ${python-version-windows} ${mongodb-version}"
@@ -2588,7 +2664,7 @@ buildvariants:
25882664
- matrix_name: "ocsp-test-macos"
25892665
matrix_spec:
25902666
platform: macos-1014
2591-
mongodb-version: ["4.4", "5.0", "latest"]
2667+
mongodb-version: ["4.4", "5.0", "6.0", "latest"]
25922668
auth: "noauth"
25932669
ssl: "ssl"
25942670
display_name: "OCSP test ${platform} ${mongodb-version}"
@@ -2606,6 +2682,8 @@ buildvariants:
26062682
- name: "aws-auth-test-4.4"
26072683
- name: "aws-auth-test-5.0"
26082684
- name: "aws-auth-test-latest"
2685+
- name: "aws-auth-test-6.0"
2686+
- name: "aws-auth-test-rapid"
26092687

26102688
- matrix_name: "aws-auth-test-mac"
26112689
matrix_spec:
@@ -2616,7 +2694,8 @@ buildvariants:
26162694
- name: "aws-auth-test-4.4"
26172695
- name: "aws-auth-test-5.0"
26182696
- name: "aws-auth-test-latest"
2619-
2697+
- name: "aws-auth-test-6.0"
2698+
- name: "aws-auth-test-rapid"
26202699
- matrix_name: "aws-auth-test-windows"
26212700
matrix_spec:
26222701
platform: [windows-64-vsMulti-small]
@@ -2626,11 +2705,13 @@ buildvariants:
26262705
- name: "aws-auth-test-4.4"
26272706
- name: "aws-auth-test-5.0"
26282707
- name: "aws-auth-test-latest"
2708+
- name: "aws-auth-test-6.0"
2709+
- name: "aws-auth-test-rapid"
26292710

26302711
- matrix_name: "load-balancer"
26312712
matrix_spec:
26322713
platform: ubuntu-18.04
2633-
mongodb-version: ["rapid", "latest"]
2714+
mongodb-version: ["rapid", "latest", "6.0"]
26342715
auth-ssl: "*"
26352716
python-version: "*"
26362717
loadbalancer: "*"

0 commit comments

Comments
 (0)