Skip to content

Commit 90ff27c

Browse files
authored
CXX-3321 Enable CSFLE for sanitizer tasks (#1434)
* Reduce sanitizers matrix to static library linkage * Print name of test executable being executed * Pin mongoc_version_minimum to 912209d (CDRIVER-5960) * CXX-3259 bump minimum server version from 4.0 to 4.2 (CDRIVER-5956) * Update MONGOC_VERSION_MINIMUM to better document current practices
1 parent d64e86b commit 90ff27c

File tree

9 files changed

+153
-1115
lines changed

9 files changed

+153
-1115
lines changed

.evergreen/config_generator/components/funcs/install_c_driver.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
from typing import Mapping
88

99

10-
# If updating mongoc_version_minimum, also update:
10+
# If updating mongoc_version_minimum to a new release (not pinning to an unreleased commit), also update:
1111
# - BSON_REQUIRED_VERSION and MONGOC_REQUIRED_VERSION in CMakeLists.txt
1212
# - the version of pkg:github/mongodb/mongo-c-driver in etc/purls.txt
1313
# - the default value of --c-driver-build-ref in etc/make_release.py
14-
# Only MONGOC_DOWNLOAD_VERSION needs to be updated when pinning to an unreleased commit.
1514
# If pinning to an unreleased commit, create a "Blocked" JIRA ticket with
1615
# a "depends on" link to the appropriate C Driver version release ticket.
17-
MONGOC_VERSION_MINIMUM = '2.0.2'
16+
MONGOC_VERSION_MINIMUM = '912209d5dc985758bc3d70b105dc5166e3ded7c3' # TODO: bump to 2.1.0 once released.
1817

1918

2019
class InstallCDriver(Function):

.evergreen/config_generator/components/funcs/test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class Test(Function):
3333
'MONGODB_API_VERSION',
3434
'platform',
3535
'TEST_WITH_ASAN',
36+
'TEST_WITH_CSFLE',
3637
'TEST_WITH_UBSAN',
3738
'TEST_WITH_VALGRIND',
3839
'use_mongocryptd',

.evergreen/config_generator/components/integration.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
LINUX_MATRIX = [
2525
# Linux x86_64 (full).
2626
# RHEL 8 x86_64: 4.0+.
27-
('rhel80', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', 'csfle'], [ '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
28-
('rhel80', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', ], ['4.0', ], ['single', 'replica', 'sharded']), # CSFLE: 4.2+.
27+
('rhel80', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', 'csfle'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
2928

3029
# Linux ARM64 (full).
3130
# Linux ARM64: 4.4+.

.evergreen/config_generator/components/sanitizers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# pylint: disable=line-too-long
2323
# fmt: off
2424
MATRIX = [
25-
('rhel80', ['asan', 'ubsan'], ['shared', 'static'], ['4.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
25+
('rhel80', ['asan', 'ubsan'], ['static'], ['4.2', '8.0', 'latest'], ['single', 'replica', 'sharded']),
2626
]
2727
# fmt: on
2828
# pylint: enable=line-too-long
@@ -57,9 +57,9 @@ def tasks():
5757
updates += [KeyValueParam(key=key, value=value)
5858
for key, value in [('cc_compiler', cc_compiler), ('cxx_compiler', cxx_compiler)]]
5959

60-
icd_vars = {'SKIP_INSTALL_LIBMONGOCRYPT': 1}
61-
compile_vars = {'ENABLE_TESTS': 'ON', 'RUN_DISTCHECK': 1}
60+
compile_vars = {'ENABLE_TESTS': 'ON'}
6261
test_vars = {
62+
'TEST_WITH_CSFLE': 'ON',
6363
'MONGOCXX_TEST_TOPOLOGY': topology,
6464
'example_projects_cc': 'clang',
6565
'example_projects_cxx': 'clang++',
@@ -96,7 +96,7 @@ def tasks():
9696
commands += [
9797
Setup.call(),
9898
StartMongod.call(mongodb_version=mongodb_version, topology=topology),
99-
InstallCDriver.call(vars=icd_vars),
99+
InstallCDriver.call(),
100100
InstallUV.call(),
101101
Compile.call(vars=compile_vars),
102102
FetchDET.call(),

.evergreen/config_generator/components/valgrind.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# fmt: off
2424
MATRIX = [
2525
# min-max-latest
26-
('rhel80', None, ['shared'], ['4.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
26+
('rhel80', None, ['shared'], ['4.2', '8.0', 'latest'], ['single', 'replica', 'sharded']),
2727
]
2828
# fmt: on
2929
# pylint: enable=line-too-long

.evergreen/generated_configs/functions.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ functions:
483483
type: setup
484484
params:
485485
updates:
486-
- { key: mongoc_version_minimum, value: 2.0.2 }
486+
- { key: mongoc_version_minimum, value: 912209d5dc985758bc3d70b105dc5166e3ded7c3 }
487487
- command: subprocess.exec
488488
type: setup
489489
params:
@@ -692,6 +692,7 @@ functions:
692692
- MONGODB_API_VERSION
693693
- platform
694694
- TEST_WITH_ASAN
695+
- TEST_WITH_CSFLE
695696
- TEST_WITH_UBSAN
696697
- TEST_WITH_VALGRIND
697698
- use_mongocryptd

0 commit comments

Comments
 (0)