summaryrefslogtreecommitdiff
path: root/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml
diff options
context:
space:
mode:
Diffstat (limited to 'buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml')
-rw-r--r--buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml
index 789152c0e84..69a701a8129 100644
--- a/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml
@@ -183,6 +183,8 @@ executor:
readPreference:
mode: "primary"
retryWrites: true
+ # TODO SERVER-68643: remove the ignoreShardMergeFeatureFlag
+ ignoreShardMergeFeatureFlag: true # overrides the featureFlagShardMerge
# We specify nodb so the shell used by each test will attempt to connect after loading the
# retry logic in auto_retry_on_network_error.js.
nodb: ""