Skip to content

CDRIVER-4580 Move compile-test coverage from macos-1014 to macos-1100 #1208

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 7 commits into from
Feb 22, 2023
Merged

CDRIVER-4580 Move compile-test coverage from macos-1014 to macos-1100 #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
57b7dde
Avoid expansions from interfering with Python package installation
eramongodb Feb 15, 2023
0e1eafe
CDRIVER-4580 Migrate cse.darwinssl matrix from macos-1015 to macos-1100
eramongodb Feb 15, 2023
1b200a8
CDRIVER-3483 Remove disabling of ZSTD tests on MacOS
eramongodb Feb 15, 2023
63a13b2
CDRIVER-4580 Migrate sasl.darwinssl tests from macos-1014 to macos-1100
eramongodb Feb 15, 2023
3558b07
Disable macos-1015 compile task in sasl.darwinssl
eramongodb Feb 15, 2023
b480c5a
Merge remote-tracking branch 'upstream/master' into cdriver-4580
eramongodb Feb 16, 2023
74c5c9f
Move scan-build from macos-1014 to macos-1100
eramongodb Feb 16, 2023
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
10 changes: 3 additions & 7 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,15 +14,15 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('macos-1015', 'clang', None, ['cyrus']),
('macos-1100', 'clang', None, ['cyrus']),
]

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

# Test 6.0+ with a replica set since Queryable Encryption does not support the 'server' topology.
('macos-1015', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0', 'latest']),
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down Expand Up @@ -56,10 +56,6 @@ def tasks():

res += generate_test_tasks(SSL, TAG, TEST_MATRIX)

# TODO: remove once MONGOCRYPT-443 is resolved.
for task in res:
task.disable = True

return res


Expand Down
1 change: 0 additions & 1 deletion .evergreen/config_generator/components/funcs/run_mock_kms_servers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ class RunMockKMSServers(Function):
bash_exec(
command_type=command_type,
working_dir='drivers-evergreen-tools/.evergreen/csfle',
add_expansions_to_env=True,
script='''\
set -o errexit
echo "Preparing KMS TLS venv environment..."
Expand Down
9 changes: 8 additions & 1 deletion .evergreen/config_generator/components/sasl/darwinssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
# fmt: off
COMPILE_MATRIX = [
('macos-1014', 'clang', None, ['cyrus']),
('macos-1015', 'clang', None, ['cyrus']),
('macos-1100', 'clang', None, ['cyrus']),
('macos-1100-arm64', 'clang', None, ['cyrus']),
]

TEST_MATRIX = [
('macos-1014', 'clang', None, 'cyrus', ['auth'], ['server'], ['3.6', '4.0', '4.2', '4.4', '5.0', 'latest']),
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server'], ['3.6', '4.0', '4.2', '4.4', '5.0', 'latest']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down Expand Up @@ -51,6 +53,11 @@ def tasks():
res += generate_compile_tasks(SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX)
res += generate_test_tasks(SSL, TAG, TEST_MATRIX)

# TODO: remove once MONGOCRYPT-443 is resolved.
for task in res:
if task.run_on == 'macos-1015':
task.disable = True

return res


Expand Down
2 changes: 1 addition & 1 deletion .evergreen/config_generator/components/scan_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# pylint: disable=line-too-long
# fmt: off
MATRIX = [
('macos-1014', 'clang', None ),
('macos-1100', 'clang', None ),
('ubuntu1404', 'clang', None ),
('ubuntu1604-arm64', 'clang', None ),
('ubuntu1604', 'clang', 'i686'),
Expand Down
1 change: 0 additions & 1 deletion .evergreen/generated_configs/functions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@ functions:
params:
binary: bash
working_dir: drivers-evergreen-tools/.evergreen/csfle
add_expansions_to_env: true
args:
- -c
- |
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/generated_configs/legacy-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9467,7 +9467,7 @@ buildvariants:
CC: clang
run_on: macos-1014
tasks:
- .compression !.snappy !.zstd
- .compression !.snappy
- release-compile
- debug-compile-nosasl-nossl
- debug-compile-rdtscp
Expand Down
Loading