Skip to content

Migrate EVG task coverage to latest Debian, Ubuntu, and RHEL distros #2044

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.

Sign up for GitHub

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 12 commits into from
Jun 25, 2025
Merged

Migrate EVG task coverage to latest Debian, Ubuntu, and RHEL distros #2044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9a75014
CDRIVER-5873 Drop Debian 9
eramongodb Jun 18, 2025
ce79b4b
CDRIVER-5874 Drop Debian 10
eramongodb Jun 18, 2025
65c1daf
Tidy up distros.py
eramongodb Jun 18, 2025
caff551
Move RHEL tasks to latest sliding alias
eramongodb Jun 18, 2025
20febd8
Group compile tasks by compile-only vs. test matrix
eramongodb Jun 23, 2025
b0a4a62
Extend Ubuntu/Debian task coverage to latest releases
eramongodb Jun 23, 2025
2b3c3b8
Sort build variant's task list by name
eramongodb Jun 23, 2025
3016928
Migrate primary server coverage tasks to RHEL distros
eramongodb Jun 23, 2025
80d6d00
ALso omit single topology for ubuntu2004-arm64 CSE tasks
eramongodb Jun 23, 2025
88691a6
Fix libbson NEWS entry header
eramongodb Jun 24, 2025
d42632c
Add coverage of single topology for CSE despite QE
eramongodb Jun 24, 2025
8885ef0
Simplify matrices and update CSFLE vs. QE comments
eramongodb Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .evergreen/config_generator/components/c_std_compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
('rhel94', 'clang', None, [99, 11, 17, 23]), # Clang 17.0 (max: C2x)
('rhel95', 'clang', None, [99, 11, 17, 23]), # Clang 18.0 (max: C23)

('rhel7.9', 'gcc', None, [99, 11, ]), # GCC 4.8 (max: C11)
('rhel80', 'gcc', None, [99, 11, 17, ]), # GCC 8.2 (max: C17)
('debian10', 'gcc-8', None, [99, 11, 17, ]), # GCC 8.3 (max: C17)
('rhel84', 'gcc', None, [99, 11, 17, ]), # GCC 8.4 (max: C17)
('ubuntu2004', 'gcc-9', None, [99, 11, 17, 23]), # GCC 9.4 (max: C2x)
('debian11', 'gcc-10', None, [99, 11, 17, 23]), # GCC 10.2 (max: C2x)
('rhel90', 'gcc', None, [99, 11, 17, 23]), # GCC 11.2 (max: C2x)
('rhel92', 'gcc', None, [99, 11, 17, 23]), # GCC 11.3 (max: C2x)
('rhel94', 'gcc', None, [99, 11, 17, 23]), # GCC 11.4 (max: C2x)
('rhel95', 'gcc', None, [99, 11, 17, 23]), # GCC 11.5 (max: C2x)
('rhel7-latest', 'gcc', None, [99, 11, ]), # GCC 4.8 (max: C11)
('rhel80', 'gcc', None, [99, 11, 17, ]), # GCC 8.2 (max: C17)
('rhel84', 'gcc', None, [99, 11, 17, ]), # GCC 8.4 (max: C17)
('ubuntu2004', 'gcc-9', None, [99, 11, 17, 23]), # GCC 9.4 (max: C2x)
('debian11', 'gcc-10', None, [99, 11, 17, 23]), # GCC 10.2 (max: C2x)
('rhel90', 'gcc', None, [99, 11, 17, 23]), # GCC 11.2 (max: C2x)
('rhel92', 'gcc', None, [99, 11, 17, 23]), # GCC 11.3 (max: C2x)
('rhel94', 'gcc', None, [99, 11, 17, 23]), # GCC 11.4 (max: C2x)
('rhel95', 'gcc', None, [99, 11, 17, 23]), # GCC 11.5 (max: C2x)
('ubuntu2404', 'gcc-13', None, [99, 11, 17, 23]), # GCC 13.3 (max: C2x)

('windows-vsCurrent', 'vs2015x64', None, [99, 11, ]), # Max: C11
('windows-vsCurrent', 'vs2017x64', None, [99, 11, ]), # Max: C11
Expand Down
45 changes: 26 additions & 19 deletions .evergreen/config_generator/components/cse/openssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,40 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('debian92', 'clang', None, ['cyrus']),
('debian92', 'gcc', None, ['cyrus']),
('debian10', 'clang', None, ['cyrus']),
('debian10', 'gcc', None, ['cyrus']),
('debian11', 'clang', None, ['cyrus']),
('debian11', 'gcc', None, ['cyrus']),
('rhel80', 'gcc', None, ['cyrus']),
# For test matrix.
('rhel8-latest', 'gcc', None, ['cyrus']),
('rhel8-zseries', 'gcc', None, ['cyrus']),
('ubuntu2004', 'clang', None, ['cyrus']),
('ubuntu2004', 'gcc', None, ['cyrus']),
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),

# For compile only.
('debian11', 'clang', None, ['cyrus']),
('debian11', 'gcc', None, ['cyrus']),
('debian12', 'clang', None, ['cyrus']),
('debian12', 'gcc', None, ['cyrus']),
('rhel80', 'gcc', None, ['cyrus']),
('ubuntu2004', 'gcc', None, ['cyrus']),
('ubuntu2004', 'clang', None, ['cyrus']),
('ubuntu2204', 'gcc', None, ['cyrus']),
('ubuntu2204', 'clang-12', None, ['cyrus']),
('ubuntu2404', 'gcc', None, ['cyrus']),
('ubuntu2404', 'clang-14', None, ['cyrus']),
]

# TODO (CDRIVER-3789): test cse with the 'sharded' topology.
# CSFLE requires 4.2+. QE requires 7.0+ and are skipped on "server" tasks.
TEST_MATRIX = [
# 4.2 and 4.4 not available on rhel8-zseries.
('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']),
# rhel8-latest provides 4.2+.
('rhel8-latest', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),

('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
# windows-vsCurrent provides 4.2+.
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),

# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']),
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']),
# ubuntu2004-arm64 provides 4.4+.
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),

# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
('debian10', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2']),
# rhel8-zseries provides 5.0+.
('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['5.0', '6.0', '7.0', '8.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down Expand Up @@ -106,6 +111,8 @@ def variants():
else:
tasks.append(task.get_task_ref())

tasks.sort(key=lambda t: t.name)

return [
BuildVariant(
name=TAG,
Expand Down
7 changes: 4 additions & 3 deletions .evergreen/config_generator/components/earthly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,11 @@ def earthly_task(


CONTAINER_RUN_DISTROS = [
"ubuntu2204-large",
"debian10-large",
"debian11-large",
"amazon2",
"debian11-large",
"debian12-large",
"ubuntu2204-large",
"ubuntu2404-large",
]


Expand Down
4 changes: 2 additions & 2 deletions .evergreen/config_generator/components/loadbalanced.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from config_generator.etc.distros import make_distro_str, find_small_distro, find_large_distro
from config_generator.etc.utils import bash_exec

# Use `rhel8.9` distro. `rhel8.9` distro includes necessary dependency: `haproxy`.
_DISTRO_NAME = "rhel8.9"
# Use `rhel8-latest` distro. `rhel8-latest` distro includes necessary dependency: `haproxy`.
_DISTRO_NAME = "rhel8-latest"
_COMPILER = "gcc"


Expand Down
5 changes: 3 additions & 2 deletions .evergreen/config_generator/components/openssl_static_compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
# pylint: disable=line-too-long
# fmt: off
MATRIX = [
('debian92', 'gcc', None),
('debian10', 'gcc', None),
('debian11', 'gcc', None),
('debian12', 'gcc', None),
('ubuntu2004', 'gcc', None),
('ubuntu2204', 'gcc', None),
('ubuntu2404', 'gcc', None),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
11 changes: 4 additions & 7 deletions .evergreen/config_generator/components/sanitizers/asan_cse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('ubuntu2004', 'clang', None, ['cyrus']),
('debian10', 'clang', None, ['cyrus']),
('rhel8-latest', 'clang', None, ['cyrus']),
]

# CSFLE requires 4.2+. QE requires 7.0+ and are skipped on "server" tasks.
TEST_MATRIX = [
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),

# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
('debian10', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2']),
# rhel8-latest provides 4.2 through latest.
('rhel8-latest', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
9 changes: 3 additions & 6 deletions .evergreen/config_generator/components/sanitizers/asan_sasl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('ubuntu2004', 'clang', None, ['cyrus']),
('debian10', 'clang', None, ['cyrus']),
('rhel8-latest', 'clang', None, ['cyrus']),
]

TEST_MATRIX = [
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),

# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
('debian10', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2']),
# rhel8-latest provides 4.2 through latest.
('rhel8-latest', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
9 changes: 3 additions & 6 deletions .evergreen/config_generator/components/sanitizers/tsan_sasl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('ubuntu2004', 'clang', None, ['cyrus']),
('debian10', 'clang', None, ['cyrus']),
('rhel8-latest', 'clang', None, ['cyrus']),
]

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

# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
('debian10', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2']),
# rhel8-latest provides 4.2 through latest.
('rhel8-latest', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
15 changes: 8 additions & 7 deletions .evergreen/config_generator/components/sasl/nossl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('ubuntu2004', 'gcc', None, ['off']),
('windows-vsCurrent', 'vs2017x64', None, ['off']),
('debian10', 'gcc', None, ['off']),
# For test matrix.
('rhel8-latest', 'gcc', None, ['off']),

# For compile only.
('ubuntu2204', 'gcc', None, ['off']),
('ubuntu2404', 'gcc', None, ['off']),
('windows-vsCurrent', 'vs2017x64', None, ['off']),
]

TEST_MATRIX = [
('ubuntu2004', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),

# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
('debian10', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['4.2']),
('rhel8-latest', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
30 changes: 17 additions & 13 deletions .evergreen/config_generator/components/sasl/openssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,33 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('debian92', 'clang', None, ['cyrus']),
('debian92', 'gcc', None, ['cyrus']),
('debian10', 'gcc', None, ['cyrus']),
('debian11', 'gcc', None, ['cyrus']),
('rhel80', 'gcc', None, ['cyrus']),
# For test matrix.
('amazon2023-arm64-latest-large-m8g', 'gcc', None, ['cyrus']),
('rhel8-latest', 'gcc', None, ['cyrus']),
('rhel8-power', 'gcc', None, ['cyrus']),
('rhel8-zseries', 'gcc', None, ['cyrus']),
('ubuntu2004', 'clang', None, ['cyrus']),
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
('ubuntu2004', 'gcc', None, ['cyrus']),
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
('amazon2023-arm64-latest-large-m8g', 'gcc', None, ['cyrus']),

# For compile only.
('debian11', 'gcc', None, ['cyrus']),
('debian12', 'gcc', None, ['cyrus']),
('rhel80', 'gcc', None, ['cyrus']),
('ubuntu2004', 'clang', None, ['cyrus']),
('ubuntu2204', 'gcc', None, ['cyrus']),
('ubuntu2204', 'clang-12', None, ['cyrus']),
('ubuntu2404', 'gcc', None, ['cyrus']),
('ubuntu2404', 'clang-14', None, ['cyrus']),
]

TEST_MATRIX = [
('rhel8-power', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
('rhel8-latest', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
('rhel8-power', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], [ '5.0', '6.0', '7.0', '8.0', 'latest']),

('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], [ 'latest']),

# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
('debian10', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2']),

# Test with Graviton processor:
('amazon2023-arm64-latest-large-m8g', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['latest']),
]
Expand Down Expand Up @@ -100,6 +102,8 @@ def variants():
else:
tasks.append(task.get_task_ref())

tasks.sort(key=lambda t: t.name)

return [
BuildVariant(
name=TAG,
Expand Down
22 changes: 11 additions & 11 deletions .evergreen/config_generator/etc/distros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Distro(BaseModel):
@validator('os_ver')
@classmethod
def validate_os_ver(cls, value):
return Version(value)
return value == 'latest' or Version(value)


def ls_distro(name, **kwargs):
Expand All @@ -46,9 +46,8 @@ def ls_distro(name, **kwargs):


DEBIAN_DISTROS = [
*ls_distro(name='debian92', os='debian', os_type='linux', os_ver='9.2'), # CDRIVER-5873
*ls_distro(name='debian10', os='debian', os_type='linux', os_ver='10'), # CDRIVER-5874
*ls_distro(name='debian11', os='debian', os_type='linux', os_ver='11'),
*ls_distro(name='debian12', os='debian', os_type='linux', os_ver='12'),
]

MACOS_DISTROS = [
Expand All @@ -61,17 +60,17 @@ def ls_distro(name, **kwargs):
]

RHEL_DISTROS = [
*ls_distro(name='rhel7.9', os='rhel', os_type='linux', os_ver='7.9'),
*ls_distro(name='rhel7-latest', os='rhel', os_type='linux', os_ver='7'),
*ls_distro(name='rhel8-latest', os='rhel', os_type='linux', os_ver='8'),

*ls_distro(name='rhel80', os='rhel', os_type='linux', os_ver='8.0'),
*ls_distro(name='rhel84', os='rhel', os_type='linux', os_ver='8.4'),
*ls_distro(name='rhel90', os='rhel', os_type='linux', os_ver='9.0'),
*ls_distro(name='rhel91', os='rhel', os_type='linux', os_ver='9.1'),
*ls_distro(name='rhel92', os='rhel', os_type='linux', os_ver='9.2'),
*ls_distro(name='rhel93', os='rhel', os_type='linux', os_ver='9.3'),
*ls_distro(name='rhel94', os='rhel', os_type='linux', os_ver='9.4'),
*ls_distro(name='rhel95', os='rhel', os_type='linux', os_ver='9.5'),
*ls_distro(name='rhel8.9', os='rhel', os_type='linux', os_ver='8.7'),
*ls_distro(name='rhel92', os='rhel', os_type='linux', os_ver='9.0'),
*ls_distro(name='rhel95', os='rhel', os_type='linux', os_ver='9.5'), # rhel9-latest
]

RHEL_POWER_DISTROS = [
Expand All @@ -85,16 +84,14 @@ def ls_distro(name, **kwargs):
UBUNTU_DISTROS = [
*ls_distro(name='ubuntu2004', os='ubuntu', os_type='linux', os_ver='20.04'),
*ls_distro(name='ubuntu2204', os='ubuntu', os_type='linux', os_ver='22.04'),
*ls_distro(name='ubuntu2404', os='ubuntu', os_type='linux', os_ver='24.04'),
]

UBUNTU_ARM64_DISTROS = [
*ls_distro(name='ubuntu2004-arm64', os='ubuntu', os_type='linux', os_ver='20.04', arch='arm64'),
]

WINDOWS_DISTROS = [
*ls_distro(name='windows-64-vs2017', os='windows', os_type='windows', vs_ver='2017'),
*ls_distro(name='windows-64-vs2019', os='windows', os_type='windows', vs_ver='2019'),

*ls_distro(name='windows-vsCurrent', os='windows', os_type='windows', vs_ver='vsCurrent'), # Windows Server 2019
]

Expand All @@ -107,6 +104,7 @@ def ls_distro(name, **kwargs):
# Ensure no-arch distros are ordered before arch-specific distros.
ALL_DISTROS = [
*DEBIAN_DISTROS,
*GRAVITON_DISTROS,
*MACOS_DISTROS,
*MACOS_ARM64_DISTROS,
*RHEL_DISTROS,
Expand All @@ -115,7 +113,6 @@ def ls_distro(name, **kwargs):
*UBUNTU_DISTROS,
*UBUNTU_ARM64_DISTROS,
*WINDOWS_DISTROS,
*GRAVITON_DISTROS
]


Expand Down Expand Up @@ -202,6 +199,9 @@ def to_platform(compiler):


def compiler_to_vars(compiler):
if compiler is None:
return {}

match compiler, compiler.split('-'):
case _, ['gcc', *rest]:
return {
Expand Down
Loading