diff options
| author | Spencer T Brody <spencer@mongodb.com> | 2016-04-06 18:14:46 -0400 |
|---|---|---|
| committer | Spencer T Brody <spencer@mongodb.com> | 2016-04-14 14:04:19 -0400 |
| commit | ecb41a7b4b135527e7f4866cb42526717e7dfd12 (patch) | |
| tree | 85dc0be47a5e18d4431f2fb004a1b7ae92c16b23 /buildscripts/resmokeconfig | |
| parent | 0fa610e2ff18b34c30616570d7856c4035fddce2 (diff) | |
| download | mongo-ecb41a7b4b135527e7f4866cb42526717e7dfd12.tar.gz | |
SERVER-23589 Move csrs upgrade tests to their own suite
Diffstat (limited to 'buildscripts/resmokeconfig')
5 files changed, 35 insertions, 8 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml index 5ef97b1d3e6..5bf1eadb528 100644 --- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml +++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml @@ -104,8 +104,6 @@ selector: - jstests/sharding/replset_config/empty_cluster_init.js # Test runs really slow with the primary continuously stepping down - jstests/sharding/zbigMapReduce.js - # Continuous config server step down only available with CSRS - - jstests/sharding/csrs_upgrade*.js # Temporarily blacklisted until more robust - jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js - jstests/sharding/cleanup_orphaned_cmd_during_movechunk.js diff --git a/buildscripts/resmokeconfig/suites/sharding_csrs_upgrade.yml b/buildscripts/resmokeconfig/suites/sharding_csrs_upgrade.yml new file mode 100644 index 00000000000..bf81c6e8a15 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/sharding_csrs_upgrade.yml @@ -0,0 +1,12 @@ +selector: + js_test: + roots: + - jstests/sharding/csrs_upgrade/*.js + exclude_files: + +executor: + js_test: + config: + shell_options: + nodb: '' + readMode: commands diff --git a/buildscripts/resmokeconfig/suites/sharding_csrs_upgrade_auth.yml b/buildscripts/resmokeconfig/suites/sharding_csrs_upgrade_auth.yml new file mode 100644 index 00000000000..f3adb91d74d --- /dev/null +++ b/buildscripts/resmokeconfig/suites/sharding_csrs_upgrade_auth.yml @@ -0,0 +1,23 @@ +# Section that is ignored by resmoke.py. +config_variables: +- &keyFile jstests/libs/authTestsKey +- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly + +selector: + js_test: + roots: + - jstests/sharding/csrs_upgrade/*.js + exclude_files: + +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/sharding_legacy.yml b/buildscripts/resmokeconfig/suites/sharding_legacy.yml index 93184da51fd..716e59ba2bb 100644 --- a/buildscripts/resmokeconfig/suites/sharding_legacy.yml +++ b/buildscripts/resmokeconfig/suites/sharding_legacy.yml @@ -4,8 +4,6 @@ selector: - jstests/sharding/*.js - jstests/sharding/sync_cluster_config/*.js exclude_files: - # Tests shard upgrade to CSRS mode, nonsensical if using SCCC config servers - - jstests/sharding/csrs_upgrade_mongod_using_movechunk.js executor: js_test: diff --git a/buildscripts/resmokeconfig/suites/sharding_legacy_multiversion.yml b/buildscripts/resmokeconfig/suites/sharding_legacy_multiversion.yml index a964a542a52..3346b87b7d7 100644 --- a/buildscripts/resmokeconfig/suites/sharding_legacy_multiversion.yml +++ b/buildscripts/resmokeconfig/suites/sharding_legacy_multiversion.yml @@ -6,7 +6,6 @@ selector: exclude_files: # The following tests fails because a certain command or functionality is not supported in v3.0 # version of mongos: - - jstests/sharding/csrs_upgrade*.js - jstests/sharding/find_getmore_cmd.js # The following tests fail because explain format changed. In v3.0, read pref is inside @@ -53,9 +52,6 @@ selector: - jstests/sharding/move_primary_basic.js # SERVER-21851 - jstests/sharding/enable_sharding_basic.js # SERVER-21853 - # Tests shard upgrade to CSRS mode, nonsensical if using SCCC config servers - - jstests/sharding/csrs_upgrade_mongod_using_movechunk.js - executor: js_test: config: |