Skip to content

CDRIVER-6075 fix and update EVG task coverage on MacOS distros #2088

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 10 commits into from
Aug 18, 2025
Merged

CDRIVER-6075 fix and update EVG task coverage on MacOS distros #2088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b4e2775
CDRIVER-6075 fix and update EVG task coverage on MacOS distros
eramongodb Aug 14, 2025
4710c8e
Fix copy-paste error in NEWS (libbson)
eramongodb Aug 14, 2025
2277f99
Revert stray changes to NEWS (libbson)
eramongodb Aug 14, 2025
fabd00f
CDRIVER-6079 skip /scram/cache_invalidation on macos-14-arm64 with re…
eramongodb Aug 14, 2025
6ec30a0
Restrict /scram/cache_invalidation skip to macos only
eramongodb Aug 14, 2025
69a465e
CDRIVER-6080 temporarily disable /client_pool/disconnects_removed_ser…
eramongodb Aug 14, 2025
4f279f7
Revert "CDRIVER-6080 temporarily disable /client_pool/disconnects_rem…
eramongodb Aug 14, 2025
f97e901
Merge remote-tracking branch 'upstream/master' into cdriver-6075
eramongodb Aug 15, 2025
b209439
Merge remote-tracking branch 'upstream/master' into cdriver-6075
eramongodb Aug 15, 2025
b3baae9
Tweak matrices according to PR feedback
eramongodb Aug 18, 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
2 changes: 2 additions & 0 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 @@ -39,6 +39,8 @@
('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)

('macos-14-arm64', 'clang', None, [99, 11, 17, 23]), # Apple Clang

('windows-vsCurrent', 'vs2015x64', None, [99, 11, ]), # Max: C11
('windows-vsCurrent', 'vs2017x64', None, [99, 11, ]), # Max: C11
('windows-vsCurrent', 'vs2019x64', None, [99, 11, 17]), # Max: C17
Expand Down
15 changes: 6 additions & 9 deletions .evergreen/config_generator/components/cse/darwinssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,18 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('macos-14', 'clang', None, ['cyrus']),

('macos-11-arm64', 'clang', None, ['cyrus']),
('macos-14-arm64', 'clang', None, ['cyrus']),
('macos-14', 'clang', None, ['cyrus']),
]

# TODO (CDRIVER-3789): test cse with the 'sharded' topology.
TEST_MATRIX = [
('macos-14', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),

('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0']),
('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0']),

# Prefer macos-14-arm64 which is less resource-limited than macos-14. Provides 6.0+.
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['7.0', '8.0', 'latest']),
('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['replica'], ['6.0', '7.0', '8.0', 'latest']),

# Pre-6.0 coverage. Resource-limited: use sparingly.
('macos-14', 'clang', None, 'cyrus', ['auth'], ['replica'], ['4.2', '4.4', '5.0']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
11 changes: 5 additions & 6 deletions .evergreen/config_generator/components/sasl/darwinssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('macos-14', 'clang', None, ['cyrus']),

('macos-11-arm64', 'clang', None, ['cyrus']),
('macos-14-arm64', 'clang', None, ['cyrus']),
('macos-14', 'clang', None, ['cyrus']),
]

TEST_MATRIX = [
('macos-14', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),
# Prefer macos-14-arm64 which is less resource-limited than macos-14. Provides 6.0+.
('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['replica'], ['6.0', '7.0', '8.0', 'latest']),

('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', ]),
('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', '8.0', 'latest']),
# Pre-6.0 coverage. Resource-limited: use sparingly.
('macos-14', 'clang', None, 'cyrus', ['auth'], ['replica'], ['4.2', '4.4', '5.0']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
1 change: 0 additions & 1 deletion .evergreen/config_generator/etc/distros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ def ls_distro(name, **kwargs):
]

MACOS_ARM64_DISTROS = [
Distro(name='macos-11-arm64', os='macos', os_type='macos', os_ver='11', arch='arm64'),
Distro(name='macos-14-arm64', os='macos', os_type='macos', os_ver='14', arch='arm64'),
]

Expand Down
Loading