summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Zolnierz <nicholas.zolnierz@mongodb.com>2022-03-02 20:54:50 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-03-02 21:26:09 +0000
commit27ce39ba637159ae0be6e7734b1d7f114af7141c (patch)
treefba430ac445437d73615471ec133d91ce23752b8
parent642b5726218b867c48aad2a05dca069fec259bbd (diff)
downloadmongo-27ce39ba637159ae0be6e7734b1d7f114af7141c.tar.gz
SERVER-64056 Pass feature flags to mongocryptd
-rw-r--r--buildscripts/resmokeconfig/suites/fle2_query_analysis.yml2
-rw-r--r--buildscripts/resmokelib/core/programs.py1
2 files changed, 1 insertions, 2 deletions
diff --git a/buildscripts/resmokeconfig/suites/fle2_query_analysis.yml b/buildscripts/resmokeconfig/suites/fle2_query_analysis.yml
index fddbf752659..57d557e6203 100644
--- a/buildscripts/resmokeconfig/suites/fle2_query_analysis.yml
+++ b/buildscripts/resmokeconfig/suites/fle2_query_analysis.yml
@@ -17,5 +17,3 @@ executor:
global_vars:
TestData:
useFle2Protocol: true
- setParametersMongocryptd:
- featureFlagFLE2: true
diff --git a/buildscripts/resmokelib/core/programs.py b/buildscripts/resmokelib/core/programs.py
index 08e224e917a..0f47f2ff5e4 100644
--- a/buildscripts/resmokelib/core/programs.py
+++ b/buildscripts/resmokelib/core/programs.py
@@ -197,6 +197,7 @@ def mongo_shell_program( # pylint: disable=too-many-arguments,too-many-branches
# Command line options to resmoke.py override the YAML configuration.
if config.MONGOCRYPTD_SET_PARAMETERS is not None:
mongocryptd_set_parameters.update(utils.load_yaml(config.MONGOCRYPTD_SET_PARAMETERS))
+ mongocryptd_set_parameters.update(feature_flag_dict)
fixturelib = FixtureLib()
mongod_launcher = standalone.MongodLauncher(fixturelib)