From 7dbcd710077bc4141e71730be9e12558880375e6 Mon Sep 17 00:00:00 2001 From: Charlie Swanson Date: Fri, 28 Sep 2018 17:13:22 -0400 Subject: SERVER-36966 Validate ns in cluster mapReduce Also ensures that the temp collections are always up to date, and extends the passthrough coverage of the mapReduce command outputting to a sharded collection. --- .../resmokeconfig/suites/sharded_collections_jscore_passthrough.yml | 6 ------ .../suites/sharding_last_stable_mongos_and_mixed_shards.yml | 2 ++ .../suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml | 2 ++ 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'buildscripts/resmokeconfig/suites') diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml index 4c68e692df8..af856f86243 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml @@ -87,12 +87,6 @@ selector: - jstests/core/index_multikey.js - jstests/core/optimized_match_explain.js - jstests/core/sort_array.js - # TODO: SERVER-16605 - - jstests/core/mr_index.js - - jstests/core/mr1.js - - jstests/core/mr3.js - - jstests/core/mr4.js - - jstests/core/mr5.js exclude_with_any_tags: - assumes_against_mongod_not_mongos # Tests tagged with the following will fail because they assume collections are not sharded. diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml index 9921398ded5..8e645823b62 100644 --- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml +++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml @@ -67,6 +67,8 @@ selector: - jstests/sharding/wildcard_index_banned_for_shard_key.js # Enable if SERVER-20865 is backported or 4.2 becomes last-stable - jstests/sharding/sharding_statistics_server_status.js + # Enable if SERVER-36966 is backported or 4.2 becomes last-stable + - jstests/sharding/mr_output_sharded_validation.js executor: config: shell_options: diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml index cbb084ae70b..c8e3c1abbe2 100644 --- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml +++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml @@ -381,6 +381,8 @@ selector: - jstests/sharding/wildcard_index_banned_for_shard_key.js # Enable if SERVER-20865 is backported or 4.2 becomes last-stable - jstests/sharding/sharding_statistics_server_status.js + # Enable if SERVER-36966 is backported or 4.2 becomes last-stable + - jstests/sharding/mr_output_sharded_validation.js executor: config: -- cgit v1.2.1