Skip to content

CDRIVER-4739 Migrate MongoDB 7.0+ Evergreen tasks from Ubuntu 18.04 to 20.04 #1431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 5, 2023
6 changes: 4 additions & 2 deletions .evergreen/config_generator/components/cse/openssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
('ubuntu1804-arm64', 'gcc', None, ['cyrus']),
('ubuntu1804', 'gcc', None, ['cyrus']),
('ubuntu2004', 'gcc', None, ['cyrus']),
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
]

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

# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
]
# fmt: on
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
# fmt: off
COMPILE_MATRIX = [
('ubuntu1804', 'clang', None, ['cyrus']),
('ubuntu2004', 'clang', None, ['cyrus']),
]

TEST_MATRIX = [
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', ], ['4.2', '4.4', '5.0', '6.0' ]),
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0']),

# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', 'latest']),
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], ['7.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@
COMPILE_MATRIX = [
('ubuntu1604', 'clang', None, ['cyrus']),
('ubuntu1804', 'clang', None, ['cyrus']),
('ubuntu2004', 'clang', None, ['cyrus']),
]

TEST_MATRIX = [
('ubuntu1604', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['3.6', ]),
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], [ '4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
('ubuntu1604', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['3.6', ]),
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], [ '4.0', '4.2', '4.4', '5.0', '6.0']),

# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['7.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@
# fmt: off
COMPILE_MATRIX = [
('ubuntu1804', 'clang', None, ['cyrus']),
('ubuntu2004', 'clang', None, ['cyrus']),
]

TEST_OPENSSL_MATRIX = [
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.0', '4.2', '4.4', '5.0', '6.0']),

# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['7.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
4 changes: 3 additions & 1 deletion .evergreen/config_generator/components/sasl/nossl.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
('macos-1014', 'clang', None, ['off']),
('ubuntu1604', 'gcc', None, ['off']),
('ubuntu1804', 'gcc', None, ['off']),
('ubuntu2004', 'gcc', None, ['off']),
('windows-vsCurrent', 'vs2017x64', None, ['off']),
]

TEST_MATRIX = [
('ubuntu1604', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['3.6', ]),
('ubuntu1804', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], [ '4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
('ubuntu1804', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], [ '4.0', '4.2', '4.4', '5.0', '6.0', ]),
('ubuntu2004', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], [ '7.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
11 changes: 8 additions & 3 deletions .evergreen/config_generator/components/sasl/openssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,21 @@
('ubuntu1604', 'clang', None, ['cyrus']),
('ubuntu1804-arm64', 'gcc', None, ['cyrus']),
('ubuntu1804', 'gcc', None, ['cyrus']),
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
('ubuntu2004', 'gcc', None, ['cyrus']),
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
]

TEST_MATRIX = [
('rhel81-power8', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '5.0', '6.0', '7.0', 'latest']),
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', 'latest']),
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', ], [ 'latest']),
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', ]),
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.0', '4.2', '4.4', '5.0', '6.0', ]),

# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['7.0', 'latest']),
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server'], ['7.0', 'latest']),
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], [ 'latest']),

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