Skip to content

Commit d896d3d

Browse files
kevinAlbseramongodb
kevinAlbs
and
eramongodb
authored
CDRIVER-4632 Add tasks to test MongoDB Server 7.0 release (#1334)
* add 7.0 to config_generator/components * add comment noting 6.0+ is required for QE * add 7.0 to legacy_config_generator * make API version task names unique * add missing 6.0 tasks * test Queryable Encryption on 7.0+ replica set (not 6.0+) As of DRIVERS-2435, Queryable Encryption tests no longer run on 6.0. * add more missing 6.0 tasks * schedule missing AWS tasks * add `test-aws` tag and use all AWS tasks Co-authored-by: Ezra Chung <[email protected]>
1 parent 47dc666 commit d896d3d

File tree

14 files changed

+6948
-1369
lines changed

14 files changed

+6948
-1369
lines changed

‎.evergreen/config_generator/components/cse/darwinssl.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
# TODO (CDRIVER-3789): test cse with the 'sharded' topology.
2121
TEST_MATRIX = [
22-
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['4.2', '4.4', '5.0']),
22+
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['4.2', '4.4', '5.0', '6.0' ]),
2323

24-
# Test 6.0+ with a replica set since Queryable Encryption does not support the 'server' topology.
25-
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0', 'latest']),
24+
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
25+
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], [ '7.0', 'latest']),
2626
]
2727
# fmt: on
2828
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/cse/openssl.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
# 4.2 and 4.4 not available on rhel83-zseries.
3434
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']),
3535

36-
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),
37-
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),
38-
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),
39-
40-
# Test 6.0+ with a replica set since Queryable Encryption does not support the 'server' topology.
41-
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['6.0', 'latest']),
42-
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['6.0', 'latest']),
43-
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['6.0', 'latest']),
44-
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], ['6.0', 'latest']),
36+
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
37+
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
38+
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
39+
40+
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
41+
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
42+
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
43+
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
44+
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
4545
]
4646
# fmt: on
4747
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/cse/winssl.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
# TODO (CDRIVER-3789): test cse with the 'sharded' topology.
2222
TEST_MATRIX = [
23-
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),
23+
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
2424

25-
# Test 6.0+ with a replica set since Queryable Encryption does not support the 'server' topology.
26-
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0', 'latest']),
25+
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
26+
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica' ], [ '7.0', 'latest']),
2727
]
2828
# fmt: on
2929
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/sanitizers/asan_cse.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414
]
1515

1616
TEST_MATRIX = [
17-
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', ], ['4.2', '4.4', '5.0', ]),
18-
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], [ '6.0', 'latest']),
17+
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', ], ['4.2', '4.4', '5.0', '6.0' ]),
18+
19+
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
20+
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
1921
]
2022
# fmt: on
2123
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/sanitizers/asan_sasl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
]
1616

1717
TEST_MATRIX = [
18-
('ubuntu1604', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['3.6', ]),
19-
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], [ '4.0', '4.2', '4.4', '5.0', '6.0', 'latest']),
18+
('ubuntu1604', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['3.6', ]),
19+
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], [ '4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
2020
]
2121
# fmt: on
2222
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/sanitizers/tsan_sasl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
]
1515

1616
TEST_OPENSSL_MATRIX = [
17-
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.0', '4.2', '4.4', '5.0', '6.0', 'latest']),
17+
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
1818
]
1919
# fmt: on
2020
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/sasl/darwinssl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
]
2323

2424
TEST_MATRIX = [
25-
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server'], ['3.6', '4.0', '4.2', '4.4', '5.0', 'latest']),
25+
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server'], ['3.6', '4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
2626
]
2727
# fmt: on
2828
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/sasl/nossl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
]
2323

2424
TEST_MATRIX = [
25-
('ubuntu1604', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['3.6', ]),
26-
('ubuntu1804', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], [ '4.0', '4.2', '4.4', '5.0', 'latest']),
25+
('ubuntu1604', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['3.6', ]),
26+
('ubuntu1804', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], [ '4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
2727
]
2828
# fmt: on
2929
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/sasl/openssl.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
]
3939

4040
TEST_MATRIX = [
41-
('rhel81-power8', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', 'latest']),
42-
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '5.0', '6.0', 'latest']),
43-
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', 'latest']),
44-
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.0', '4.2', '4.4', '5.0', '6.0', 'latest']),
45-
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', ], [ 'latest']),
41+
('rhel81-power8', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
42+
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '5.0', '6.0', '7.0', 'latest']),
43+
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
44+
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
45+
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', ], [ 'latest']),
4646

4747
# Test ARM64 + 4.0 on Ubuntu 16.04, as MongoDB server does not produce
4848
# downloads for Ubuntu 18.04 arm64.

‎.evergreen/config_generator/components/sasl/winssl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
]
2626

2727
TEST_MATRIX = [
28-
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['3.6', '4.0', '4.2', '4.4', '5.0', '6.0', 'latest']),
28+
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['3.6', '4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
2929

3030
('windows-vsCurrent', 'mingw', None, 'sspi', ['auth'], ['server'], ['latest']),
3131
('windows-vsCurrent', 'vs2017x64', None, 'sspi', ['auth'], ['server'], ['latest']),

0 commit comments

Comments
 (0)