From 28d3fcc623b7c51d27542956182c488c0b8a34dd Mon Sep 17 00:00:00 2001 From: Judah Schvimer Date: Thu, 23 Feb 2017 17:58:35 -0500 Subject: SERVER-27995 rename replication test suites to be more consistent (cherry picked from commit 068878410614c789f23b2abc6c5b9680c82abe5e) --- .../resmokeconfig/suites/core_small_oplog.yml | 27 -------- .../resmokeconfig/suites/core_small_oplog_rs.yml | 31 --------- .../suites/core_small_oplog_rs_initsync.yml | 76 --------------------- .../suites/core_small_oplog_rs_initsync_static.yml | 36 ---------- .../suites/core_small_oplog_rs_resync.yml | 77 ---------------------- .../suites/core_small_oplog_rs_resync_static.yml | 37 ----------- buildscripts/resmokeconfig/suites/master_slave.yml | 14 ++++ .../resmokeconfig/suites/master_slave_auth.yml | 27 ++++++++ .../suites/master_slave_jscore_passthrough.yml | 27 ++++++++ .../replica_sets_initsync_jscore_passthrough.yml | 76 +++++++++++++++++++++ ...ica_sets_initsync_static_jscore_passthrough.yml | 36 ++++++++++ .../suites/replica_sets_jscore_passthrough.yml | 31 +++++++++ .../replica_sets_resync_jscore_passthrough.yml | 77 ++++++++++++++++++++++ ...plica_sets_resync_static_jscore_passthrough.yml | 37 +++++++++++ buildscripts/resmokeconfig/suites/replication.yml | 14 ---- .../resmokeconfig/suites/replication_auth.yml | 27 -------- 16 files changed, 325 insertions(+), 325 deletions(-) delete mode 100644 buildscripts/resmokeconfig/suites/core_small_oplog.yml delete mode 100644 buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml delete mode 100644 buildscripts/resmokeconfig/suites/core_small_oplog_rs_initsync.yml delete mode 100644 buildscripts/resmokeconfig/suites/core_small_oplog_rs_initsync_static.yml delete mode 100644 buildscripts/resmokeconfig/suites/core_small_oplog_rs_resync.yml delete mode 100644 buildscripts/resmokeconfig/suites/core_small_oplog_rs_resync_static.yml create mode 100644 buildscripts/resmokeconfig/suites/master_slave.yml create mode 100644 buildscripts/resmokeconfig/suites/master_slave_auth.yml create mode 100644 buildscripts/resmokeconfig/suites/master_slave_jscore_passthrough.yml create mode 100644 buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml create mode 100644 buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml create mode 100644 buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml create mode 100644 buildscripts/resmokeconfig/suites/replica_sets_resync_jscore_passthrough.yml create mode 100644 buildscripts/resmokeconfig/suites/replica_sets_resync_static_jscore_passthrough.yml delete mode 100644 buildscripts/resmokeconfig/suites/replication.yml delete mode 100644 buildscripts/resmokeconfig/suites/replication_auth.yml (limited to 'buildscripts/resmokeconfig') diff --git a/buildscripts/resmokeconfig/suites/core_small_oplog.yml b/buildscripts/resmokeconfig/suites/core_small_oplog.yml deleted file mode 100644 index 95cc6b24638..00000000000 --- a/buildscripts/resmokeconfig/suites/core_small_oplog.yml +++ /dev/null @@ -1,27 +0,0 @@ -selector: - js_test: - roots: - - jstests/core/*.js - exclude_files: - # These tests are not expected to pass with master-slave: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/capped_update.js - -executor: - js_test: - config: - shell_options: - eval: "testingReplication = true;" - readMode: commands - hooks: - - class: ValidateCollections - - class: CheckReplDBHash - - class: CleanEveryN - n: 20 - fixture: - class: MasterSlaveFixture - mongod_options: - oplogSize: 511 - set_parameters: - enableTestCommands: 1 diff --git a/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml b/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml deleted file mode 100644 index c3c4bf06769..00000000000 --- a/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml +++ /dev/null @@ -1,31 +0,0 @@ -selector: - js_test: - roots: - - jstests/core/*.js - exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js - -executor: - js_test: - config: - shell_options: - eval: "testingReplication = true;" - readMode: commands - hooks: - - class: ValidateCollections - - class: CheckReplOplogs - - class: CheckReplDBHash - - class: CleanEveryN - n: 20 - fixture: - class: ReplicaSetFixture - mongod_options: - oplogSize: 511 - set_parameters: - enableTestCommands: 1 - numInitialSyncAttempts: 1 - num_nodes: 2 diff --git a/buildscripts/resmokeconfig/suites/core_small_oplog_rs_initsync.yml b/buildscripts/resmokeconfig/suites/core_small_oplog_rs_initsync.yml deleted file mode 100644 index 14ec54f844b..00000000000 --- a/buildscripts/resmokeconfig/suites/core_small_oplog_rs_initsync.yml +++ /dev/null @@ -1,76 +0,0 @@ -selector: - js_test: - roots: - - jstests/core/*.js - exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js - # These tests use map-reduce which can lead to consistency mismatches (SERVER-27147). - - jstests/core/bypass_doc_validation.js - - jstests/core/collation.js - - jstests/core/commands_that_do_not_write_do_not_accept_wc.js - - jstests/core/constructors.js - - jstests/core/eval_mr.js - - jstests/core/geo_big_polygon3.js - - jstests/core/geo_mapreduce.js - - jstests/core/geo_mapreduce2.js - - jstests/core/index_stats.js - - jstests/core/mr1.js - - jstests/core/mr2.js - - jstests/core/mr3.js - - jstests/core/mr4.js - - jstests/core/mr5.js - - jstests/core/mr_bigobject.js - - jstests/core/mr_bigobject_replace.js - - jstests/core/mr_comments.js - - jstests/core/mr_errorhandling.js - - jstests/core/mr_index.js - - jstests/core/mr_index2.js - - jstests/core/mr_index3.js - - jstests/core/mr_killop.js - - jstests/core/mr_merge.js - - jstests/core/mr_merge2.js - - jstests/core/mr_mutable_properties.js - - jstests/core/mr_optim.js - - jstests/core/mr_outreduce.js - - jstests/core/mr_outreduce2.js - - jstests/core/mr_replaceIntoDB.js - - jstests/core/mr_sort.js - - jstests/core/mr_stored.js - - jstests/core/mr_undef.js - - jstests/core/opcounters_active.js - - jstests/core/or4.js - - jstests/core/profile_mapreduce.js - - jstests/core/recursion.js - - jstests/core/system_profile.js - - jstests/core/temp_cleanup.js - # apply_ops1.js is blacklisted since it uses non-idempotent applyOps commands (SERVER-27096). - - jstests/core/apply_ops1.js - # operation_latency_histogram.js and geo_s2cursorlimitskip.js do not expect concurrent reads - # against their test collections. - - jstests/core/operation_latency_histogram.js - - jstests/core/geo_s2cursorlimitskip.js - -run_hook_interval: &run_hook_interval 20 -executor: - js_test: - config: - shell_options: - eval: "testingReplication = true;" - readMode: commands - hooks: - - class: BackgroundInitialSync - n: *run_hook_interval - - class: CleanEveryN - n: *run_hook_interval - fixture: - class: ReplicaSetFixture - mongod_options: - oplogSize: 511 - set_parameters: - enableTestCommands: 1 - num_nodes: 2 - start_initial_sync_node: True diff --git a/buildscripts/resmokeconfig/suites/core_small_oplog_rs_initsync_static.yml b/buildscripts/resmokeconfig/suites/core_small_oplog_rs_initsync_static.yml deleted file mode 100644 index f6440433bce..00000000000 --- a/buildscripts/resmokeconfig/suites/core_small_oplog_rs_initsync_static.yml +++ /dev/null @@ -1,36 +0,0 @@ -selector: - js_test: - roots: - - jstests/core/*.js - exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js - -run_hook_interval: &run_hook_interval 20 -executor: - js_test: - config: - shell_options: - eval: "testingReplication = true;" - readMode: commands - hooks: - - class: IntermediateInitialSync - n: *run_hook_interval - - class: CleanEveryN - n: *run_hook_interval - fixture: - class: ReplicaSetFixture - mongod_options: - oplogSize: 511 - set_parameters: - enableTestCommands: 1 - numInitialSyncAttempts: 1 - numInitialSyncConnectAttempts: 60 - num_nodes: 2 - start_initial_sync_node: True - replset_config_options: - settings: - chainingAllowed: False diff --git a/buildscripts/resmokeconfig/suites/core_small_oplog_rs_resync.yml b/buildscripts/resmokeconfig/suites/core_small_oplog_rs_resync.yml deleted file mode 100644 index 794ec483123..00000000000 --- a/buildscripts/resmokeconfig/suites/core_small_oplog_rs_resync.yml +++ /dev/null @@ -1,77 +0,0 @@ -selector: - js_test: - roots: - - jstests/core/*.js - exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js - # These tests use map-reduce which can lead to consistency mismatches (SERVER-27147). - - jstests/core/bypass_doc_validation.js - - jstests/core/collation.js - - jstests/core/commands_that_do_not_write_do_not_accept_wc.js - - jstests/core/constructors.js - - jstests/core/eval_mr.js - - jstests/core/geo_big_polygon3.js - - jstests/core/geo_mapreduce.js - - jstests/core/geo_mapreduce2.js - - jstests/core/index_stats.js - - jstests/core/mr1.js - - jstests/core/mr2.js - - jstests/core/mr3.js - - jstests/core/mr4.js - - jstests/core/mr5.js - - jstests/core/mr_bigobject.js - - jstests/core/mr_bigobject_replace.js - - jstests/core/mr_comments.js - - jstests/core/mr_errorhandling.js - - jstests/core/mr_index.js - - jstests/core/mr_index2.js - - jstests/core/mr_index3.js - - jstests/core/mr_killop.js - - jstests/core/mr_merge.js - - jstests/core/mr_merge2.js - - jstests/core/mr_mutable_properties.js - - jstests/core/mr_optim.js - - jstests/core/mr_outreduce.js - - jstests/core/mr_outreduce2.js - - jstests/core/mr_replaceIntoDB.js - - jstests/core/mr_sort.js - - jstests/core/mr_stored.js - - jstests/core/mr_undef.js - - jstests/core/opcounters_active.js - - jstests/core/or4.js - - jstests/core/profile_mapreduce.js - - jstests/core/recursion.js - - jstests/core/system_profile.js - - jstests/core/temp_cleanup.js - # apply_ops1.js is blacklisted since it uses non-idempotent applyOps commands (SERVER-27096). - - jstests/core/apply_ops1.js - # operation_latency_histogram.js and geo_s2cursorlimitskip.js do not expect concurrent reads - # against their test collections. - - jstests/core/operation_latency_histogram.js - - jstests/core/geo_s2cursorlimitskip.js - -run_hook_interval: &run_hook_interval 20 -executor: - js_test: - config: - shell_options: - eval: "testingReplication = true;" - readMode: commands - hooks: - - class: BackgroundInitialSync - use_resync: True - n: *run_hook_interval - - class: CleanEveryN - n: *run_hook_interval - fixture: - class: ReplicaSetFixture - mongod_options: - oplogSize: 511 - set_parameters: - enableTestCommands: 1 - num_nodes: 2 - start_initial_sync_node: True diff --git a/buildscripts/resmokeconfig/suites/core_small_oplog_rs_resync_static.yml b/buildscripts/resmokeconfig/suites/core_small_oplog_rs_resync_static.yml deleted file mode 100644 index e925de9e611..00000000000 --- a/buildscripts/resmokeconfig/suites/core_small_oplog_rs_resync_static.yml +++ /dev/null @@ -1,37 +0,0 @@ -selector: - js_test: - roots: - - jstests/core/*.js - exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js - -run_hook_interval: &run_hook_interval 20 -executor: - js_test: - config: - shell_options: - eval: "testingReplication = true;" - readMode: commands - hooks: - - class: IntermediateInitialSync - use_resync: True - n: *run_hook_interval - - class: CleanEveryN - n: *run_hook_interval - fixture: - class: ReplicaSetFixture - mongod_options: - oplogSize: 511 - set_parameters: - enableTestCommands: 1 - numInitialSyncAttempts: 1 - numInitialSyncConnectAttempts: 60 - num_nodes: 2 - start_initial_sync_node: True - replset_config_options: - settings: - chainingAllowed: False diff --git a/buildscripts/resmokeconfig/suites/master_slave.yml b/buildscripts/resmokeconfig/suites/master_slave.yml new file mode 100644 index 00000000000..8ada95d1760 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/master_slave.yml @@ -0,0 +1,14 @@ +selector: + js_test: + roots: + - jstests/master_slave/*.js + exclude_files: + # Skip until SERVER-25618 is resolved. + - jstests/master_slave/block1.js + +executor: + js_test: + config: + shell_options: + nodb: '' + readMode: commands diff --git a/buildscripts/resmokeconfig/suites/master_slave_auth.yml b/buildscripts/resmokeconfig/suites/master_slave_auth.yml new file mode 100644 index 00000000000..6ce42adbe9a --- /dev/null +++ b/buildscripts/resmokeconfig/suites/master_slave_auth.yml @@ -0,0 +1,27 @@ +# Section that is ignored by resmoke.py. +config_variables: +- &keyFile jstests/libs/authTestsKey +- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly + +selector: + js_test: + roots: + - jstests/master_slave/*.js + exclude_files: + # Skip any tests that run with auth explicitly. + - jstests/master_slave/*[aA]uth*.js + # Skip until SERVER-25618 is resolved. + - jstests/master_slave/block1.js + +executor: + js_test: + config: + shell_options: + global_vars: + TestData: + auth: true + authMechanism: SCRAM-SHA-1 + keyFile: *keyFile + keyFileData: *keyFileData + nodb: '' + readMode: commands diff --git a/buildscripts/resmokeconfig/suites/master_slave_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/master_slave_jscore_passthrough.yml new file mode 100644 index 00000000000..95cc6b24638 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/master_slave_jscore_passthrough.yml @@ -0,0 +1,27 @@ +selector: + js_test: + roots: + - jstests/core/*.js + exclude_files: + # These tests are not expected to pass with master-slave: + - jstests/core/dbadmin.js + - jstests/core/opcounters_write_cmd.js + - jstests/core/capped_update.js + +executor: + js_test: + config: + shell_options: + eval: "testingReplication = true;" + readMode: commands + hooks: + - class: ValidateCollections + - class: CheckReplDBHash + - class: CleanEveryN + n: 20 + fixture: + class: MasterSlaveFixture + mongod_options: + oplogSize: 511 + set_parameters: + enableTestCommands: 1 diff --git a/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml new file mode 100644 index 00000000000..14ec54f844b --- /dev/null +++ b/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml @@ -0,0 +1,76 @@ +selector: + js_test: + roots: + - jstests/core/*.js + exclude_files: + # These tests are not expected to pass with replica-sets: + - jstests/core/dbadmin.js + - jstests/core/opcounters_write_cmd.js + - jstests/core/read_after_optime.js + - jstests/core/capped_update.js + # These tests use map-reduce which can lead to consistency mismatches (SERVER-27147). + - jstests/core/bypass_doc_validation.js + - jstests/core/collation.js + - jstests/core/commands_that_do_not_write_do_not_accept_wc.js + - jstests/core/constructors.js + - jstests/core/eval_mr.js + - jstests/core/geo_big_polygon3.js + - jstests/core/geo_mapreduce.js + - jstests/core/geo_mapreduce2.js + - jstests/core/index_stats.js + - jstests/core/mr1.js + - jstests/core/mr2.js + - jstests/core/mr3.js + - jstests/core/mr4.js + - jstests/core/mr5.js + - jstests/core/mr_bigobject.js + - jstests/core/mr_bigobject_replace.js + - jstests/core/mr_comments.js + - jstests/core/mr_errorhandling.js + - jstests/core/mr_index.js + - jstests/core/mr_index2.js + - jstests/core/mr_index3.js + - jstests/core/mr_killop.js + - jstests/core/mr_merge.js + - jstests/core/mr_merge2.js + - jstests/core/mr_mutable_properties.js + - jstests/core/mr_optim.js + - jstests/core/mr_outreduce.js + - jstests/core/mr_outreduce2.js + - jstests/core/mr_replaceIntoDB.js + - jstests/core/mr_sort.js + - jstests/core/mr_stored.js + - jstests/core/mr_undef.js + - jstests/core/opcounters_active.js + - jstests/core/or4.js + - jstests/core/profile_mapreduce.js + - jstests/core/recursion.js + - jstests/core/system_profile.js + - jstests/core/temp_cleanup.js + # apply_ops1.js is blacklisted since it uses non-idempotent applyOps commands (SERVER-27096). + - jstests/core/apply_ops1.js + # operation_latency_histogram.js and geo_s2cursorlimitskip.js do not expect concurrent reads + # against their test collections. + - jstests/core/operation_latency_histogram.js + - jstests/core/geo_s2cursorlimitskip.js + +run_hook_interval: &run_hook_interval 20 +executor: + js_test: + config: + shell_options: + eval: "testingReplication = true;" + readMode: commands + hooks: + - class: BackgroundInitialSync + n: *run_hook_interval + - class: CleanEveryN + n: *run_hook_interval + fixture: + class: ReplicaSetFixture + mongod_options: + oplogSize: 511 + set_parameters: + enableTestCommands: 1 + num_nodes: 2 + start_initial_sync_node: True diff --git a/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml new file mode 100644 index 00000000000..f6440433bce --- /dev/null +++ b/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml @@ -0,0 +1,36 @@ +selector: + js_test: + roots: + - jstests/core/*.js + exclude_files: + # These tests are not expected to pass with replica-sets: + - jstests/core/dbadmin.js + - jstests/core/opcounters_write_cmd.js + - jstests/core/read_after_optime.js + - jstests/core/capped_update.js + +run_hook_interval: &run_hook_interval 20 +executor: + js_test: + config: + shell_options: + eval: "testingReplication = true;" + readMode: commands + hooks: + - class: IntermediateInitialSync + n: *run_hook_interval + - class: CleanEveryN + n: *run_hook_interval + fixture: + class: ReplicaSetFixture + mongod_options: + oplogSize: 511 + set_parameters: + enableTestCommands: 1 + numInitialSyncAttempts: 1 + numInitialSyncConnectAttempts: 60 + num_nodes: 2 + start_initial_sync_node: True + replset_config_options: + settings: + chainingAllowed: False diff --git a/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml new file mode 100644 index 00000000000..c3c4bf06769 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml @@ -0,0 +1,31 @@ +selector: + js_test: + roots: + - jstests/core/*.js + exclude_files: + # These tests are not expected to pass with replica-sets: + - jstests/core/dbadmin.js + - jstests/core/opcounters_write_cmd.js + - jstests/core/read_after_optime.js + - jstests/core/capped_update.js + +executor: + js_test: + config: + shell_options: + eval: "testingReplication = true;" + readMode: commands + hooks: + - class: ValidateCollections + - class: CheckReplOplogs + - class: CheckReplDBHash + - class: CleanEveryN + n: 20 + fixture: + class: ReplicaSetFixture + mongod_options: + oplogSize: 511 + set_parameters: + enableTestCommands: 1 + numInitialSyncAttempts: 1 + num_nodes: 2 diff --git a/buildscripts/resmokeconfig/suites/replica_sets_resync_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_resync_jscore_passthrough.yml new file mode 100644 index 00000000000..794ec483123 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/replica_sets_resync_jscore_passthrough.yml @@ -0,0 +1,77 @@ +selector: + js_test: + roots: + - jstests/core/*.js + exclude_files: + # These tests are not expected to pass with replica-sets: + - jstests/core/dbadmin.js + - jstests/core/opcounters_write_cmd.js + - jstests/core/read_after_optime.js + - jstests/core/capped_update.js + # These tests use map-reduce which can lead to consistency mismatches (SERVER-27147). + - jstests/core/bypass_doc_validation.js + - jstests/core/collation.js + - jstests/core/commands_that_do_not_write_do_not_accept_wc.js + - jstests/core/constructors.js + - jstests/core/eval_mr.js + - jstests/core/geo_big_polygon3.js + - jstests/core/geo_mapreduce.js + - jstests/core/geo_mapreduce2.js + - jstests/core/index_stats.js + - jstests/core/mr1.js + - jstests/core/mr2.js + - jstests/core/mr3.js + - jstests/core/mr4.js + - jstests/core/mr5.js + - jstests/core/mr_bigobject.js + - jstests/core/mr_bigobject_replace.js + - jstests/core/mr_comments.js + - jstests/core/mr_errorhandling.js + - jstests/core/mr_index.js + - jstests/core/mr_index2.js + - jstests/core/mr_index3.js + - jstests/core/mr_killop.js + - jstests/core/mr_merge.js + - jstests/core/mr_merge2.js + - jstests/core/mr_mutable_properties.js + - jstests/core/mr_optim.js + - jstests/core/mr_outreduce.js + - jstests/core/mr_outreduce2.js + - jstests/core/mr_replaceIntoDB.js + - jstests/core/mr_sort.js + - jstests/core/mr_stored.js + - jstests/core/mr_undef.js + - jstests/core/opcounters_active.js + - jstests/core/or4.js + - jstests/core/profile_mapreduce.js + - jstests/core/recursion.js + - jstests/core/system_profile.js + - jstests/core/temp_cleanup.js + # apply_ops1.js is blacklisted since it uses non-idempotent applyOps commands (SERVER-27096). + - jstests/core/apply_ops1.js + # operation_latency_histogram.js and geo_s2cursorlimitskip.js do not expect concurrent reads + # against their test collections. + - jstests/core/operation_latency_histogram.js + - jstests/core/geo_s2cursorlimitskip.js + +run_hook_interval: &run_hook_interval 20 +executor: + js_test: + config: + shell_options: + eval: "testingReplication = true;" + readMode: commands + hooks: + - class: BackgroundInitialSync + use_resync: True + n: *run_hook_interval + - class: CleanEveryN + n: *run_hook_interval + fixture: + class: ReplicaSetFixture + mongod_options: + oplogSize: 511 + set_parameters: + enableTestCommands: 1 + num_nodes: 2 + start_initial_sync_node: True diff --git a/buildscripts/resmokeconfig/suites/replica_sets_resync_static_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_resync_static_jscore_passthrough.yml new file mode 100644 index 00000000000..e925de9e611 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/replica_sets_resync_static_jscore_passthrough.yml @@ -0,0 +1,37 @@ +selector: + js_test: + roots: + - jstests/core/*.js + exclude_files: + # These tests are not expected to pass with replica-sets: + - jstests/core/dbadmin.js + - jstests/core/opcounters_write_cmd.js + - jstests/core/read_after_optime.js + - jstests/core/capped_update.js + +run_hook_interval: &run_hook_interval 20 +executor: + js_test: + config: + shell_options: + eval: "testingReplication = true;" + readMode: commands + hooks: + - class: IntermediateInitialSync + use_resync: True + n: *run_hook_interval + - class: CleanEveryN + n: *run_hook_interval + fixture: + class: ReplicaSetFixture + mongod_options: + oplogSize: 511 + set_parameters: + enableTestCommands: 1 + numInitialSyncAttempts: 1 + numInitialSyncConnectAttempts: 60 + num_nodes: 2 + start_initial_sync_node: True + replset_config_options: + settings: + chainingAllowed: False diff --git a/buildscripts/resmokeconfig/suites/replication.yml b/buildscripts/resmokeconfig/suites/replication.yml deleted file mode 100644 index c4cc646fb34..00000000000 --- a/buildscripts/resmokeconfig/suites/replication.yml +++ /dev/null @@ -1,14 +0,0 @@ -selector: - js_test: - roots: - - jstests/repl/*.js - exclude_files: - # Skip until SERVER-25618 is resolved. - - jstests/repl/block1.js - -executor: - js_test: - config: - shell_options: - nodb: '' - readMode: commands diff --git a/buildscripts/resmokeconfig/suites/replication_auth.yml b/buildscripts/resmokeconfig/suites/replication_auth.yml deleted file mode 100644 index 5185ef347db..00000000000 --- a/buildscripts/resmokeconfig/suites/replication_auth.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Section that is ignored by resmoke.py. -config_variables: -- &keyFile jstests/libs/authTestsKey -- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly - -selector: - js_test: - roots: - - jstests/repl/*.js - exclude_files: - # Skip any tests that run with auth explicitly. - - jstests/repl/*[aA]uth*.js - # Skip until SERVER-25618 is resolved. - - jstests/repl/block1.js - -executor: - js_test: - config: - shell_options: - global_vars: - TestData: - auth: true - authMechanism: SCRAM-SHA-1 - keyFile: *keyFile - keyFileData: *keyFileData - nodb: '' - readMode: commands -- cgit v1.2.1