Skip to content

Commit eb63e07

Browse files
CDRIVER-4739 Migrate MongoDB 7.0+ Evergreen tasks from Ubuntu 18.04 to 20.04 (#1431)
* use Ubuntu 20.04 variant for MongoDB 7.0+ in new Evergreen config * split legacy AWS tasks into ubuntu1804 and ubuntu2004 variants * split legacy Versioned API tasks into ubuntu1804 and ubuntu2004 variants Co-authored-by: Ezra Chung <[email protected]>
1 parent e0d3c4f commit eb63e07

File tree

10 files changed

+436
-308
lines changed

10 files changed

+436
-308
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
('ubuntu1804-arm64', 'gcc', None, ['cyrus']),
2626
('ubuntu1804', 'gcc', None, ['cyrus']),
2727
('ubuntu2004', 'gcc', None, ['cyrus']),
28+
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
2829
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
2930
]
3031

@@ -38,9 +39,10 @@
3839
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
3940

4041
# 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+
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
43+
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
4244
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
43-
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
45+
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
4446
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
4547
]
4648
# fmt: on

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
# fmt: off
1212
COMPILE_MATRIX = [
1313
('ubuntu1804', 'clang', None, ['cyrus']),
14+
('ubuntu2004', 'clang', None, ['cyrus']),
1415
]
1516

1617
TEST_MATRIX = [
17-
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', ], ['4.2', '4.4', '5.0', '6.0' ]),
18+
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0']),
1819

1920
# 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']),
21+
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
22+
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], ['7.0', 'latest']),
2123
]
2224
# fmt: on
2325
# pylint: enable=line-too-long

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@
1212
COMPILE_MATRIX = [
1313
('ubuntu1604', 'clang', None, ['cyrus']),
1414
('ubuntu1804', 'clang', None, ['cyrus']),
15+
('ubuntu2004', 'clang', None, ['cyrus']),
1516
]
1617

1718
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', '7.0', 'latest']),
19+
('ubuntu1604', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['3.6', ]),
20+
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], [ '4.0', '4.2', '4.4', '5.0', '6.0']),
21+
22+
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
23+
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['7.0', 'latest']),
2024
]
2125
# fmt: on
2226
# pylint: enable=line-too-long

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@
1111
# fmt: off
1212
COMPILE_MATRIX = [
1313
('ubuntu1804', 'clang', None, ['cyrus']),
14+
('ubuntu2004', 'clang', None, ['cyrus']),
1415
]
1516

1617
TEST_OPENSSL_MATRIX = [
17-
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
18+
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.0', '4.2', '4.4', '5.0', '6.0']),
19+
20+
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
21+
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['7.0', 'latest']),
1822
]
1923
# fmt: on
2024
# pylint: enable=line-too-long

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
('macos-1014', 'clang', None, ['off']),
1919
('ubuntu1604', 'gcc', None, ['off']),
2020
('ubuntu1804', 'gcc', None, ['off']),
21+
('ubuntu2004', 'gcc', None, ['off']),
2122
('windows-vsCurrent', 'vs2017x64', None, ['off']),
2223
]
2324

2425
TEST_MATRIX = [
2526
('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']),
27+
('ubuntu1804', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], [ '4.0', '4.2', '4.4', '5.0', '6.0', ]),
28+
('ubuntu2004', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], [ '7.0', 'latest']),
2729
]
2830
# fmt: on
2931
# pylint: enable=line-too-long

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,21 @@
3333
('ubuntu1604', 'clang', None, ['cyrus']),
3434
('ubuntu1804-arm64', 'gcc', None, ['cyrus']),
3535
('ubuntu1804', 'gcc', None, ['cyrus']),
36+
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
3637
('ubuntu2004', 'gcc', None, ['cyrus']),
3738
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
3839
]
3940

4041
TEST_MATRIX = [
4142
('rhel81-power8', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
4243
('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']),
44+
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', ]),
45+
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.0', '4.2', '4.4', '5.0', '6.0', ]),
46+
47+
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
48+
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['7.0', 'latest']),
49+
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server'], ['7.0', 'latest']),
50+
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], [ 'latest']),
4651

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

0 commit comments

Comments
 (0)