diff options
| author | Kevin Albertson <kevin.albertson@10gen.com> | 2018-03-25 01:22:47 -0400 |
|---|---|---|
| committer | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2018-03-25 01:22:47 -0400 |
| commit | 92e92c023843c2f73ce752284a14fa1e3ca92933 (patch) | |
| tree | 7f538b20587bf30035b90c155890a7722d929936 /buildscripts | |
| parent | e674fb5ae0b41a0f3efad5275a62cc4514d7bd42 (diff) | |
| download | mongo-92e92c023843c2f73ce752284a14fa1e3ca92933.tar.gz | |
SERVER-21630 run CheckReplDBHash on csrs and shard replset
And run ValidateCollections hook on priority=0 secondaries.
(cherry picked from commit b9decc492c0ff942d5bcd6e8c799de70fa0839af)
Diffstat (limited to 'buildscripts')
6 files changed, 23 insertions, 6 deletions
diff --git a/buildscripts/resmokeconfig/suites/aggregation_sharded_collections_passthrough.yml b/buildscripts/resmokeconfig/suites/aggregation_sharded_collections_passthrough.yml index fa367432dc5..1cb834a63eb 100644 --- a/buildscripts/resmokeconfig/suites/aggregation_sharded_collections_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/aggregation_sharded_collections_passthrough.yml @@ -34,6 +34,7 @@ executor: readMode: commands eval: load("jstests/libs/override_methods/implicitly_shard_accessed_collections.js") hooks: + - class: CheckReplDBHash - class: ValidateCollections - class: CleanEveryN n: 20 diff --git a/buildscripts/resmokeconfig/suites/integration_tests_sharded.yml b/buildscripts/resmokeconfig/suites/integration_tests_sharded.yml index db7bc2b0c15..a0e8c16be9b 100644 --- a/buildscripts/resmokeconfig/suites/integration_tests_sharded.yml +++ b/buildscripts/resmokeconfig/suites/integration_tests_sharded.yml @@ -8,6 +8,7 @@ executor: cpp_integration_test: config: {} hooks: + - class: CheckReplDBHash - class: ValidateCollections fixture: class: ShardedClusterFixture diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml index 8eb912aee14..9a8a02db6b9 100644 --- a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml +++ b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml @@ -9,6 +9,11 @@ executor: shell_options: readMode: commands hooks: + - class: CheckReplDBHash + shell_options: + global_vars: + TestData: + skipValidationOnInvalidViewDefinitions: true - class: ValidateCollections shell_options: global_vars: diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml index d0f205b8840..96674cfc20c 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml @@ -74,6 +74,7 @@ executor: readMode: commands eval: load("jstests/libs/override_methods/implicitly_shard_accessed_collections.js") hooks: + - class: CheckReplDBHash - class: ValidateCollections - class: CleanEveryN n: 20 diff --git a/buildscripts/resmokeconfig/suites/sharding_gle_auth_basics_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_gle_auth_basics_passthrough.yml index 56b4854cde9..8879e39f143 100644 --- a/buildscripts/resmokeconfig/suites/sharding_gle_auth_basics_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_gle_auth_basics_passthrough.yml @@ -2,6 +2,11 @@ config_variables: - &keyFile jstests/libs/authTestsKey - &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly +- &authOptions + authenticationDatabase: admin + authenticationMechanism: SCRAM-SHA-1 + password: *keyFileData + username: __system selector: js_test: @@ -17,18 +22,21 @@ executor: config: shell_options: global_vars: - TestData: + TestData: &TestData auth: true authMechanism: SCRAM-SHA-1 keyFile: *keyFile keyFileData: *keyFileData eval: jsTest.authenticate(db.getMongo()) - authenticationDatabase: admin - authenticationMechanism: SCRAM-SHA-1 - password: *keyFileData - username: __system + <<: *authOptions readMode: commands - + hooks: + - class: CheckReplDBHash + shell_options: + global_vars: + TestData: *TestData + eval: jsTest.authenticate(db.getMongo()) + <<: *authOptions fixture: class: ShardedClusterFixture mongos_options: diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml index 620ca06e310..496bd265a58 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml @@ -55,6 +55,7 @@ executor: shell_options: readMode: commands hooks: + - class: CheckReplDBHash - class: ValidateCollections - class: CleanEveryN n: 20 |