summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorCharlie Swanson <charlie.swanson@mongodb.com>2018-09-28 17:13:22 -0400
committerCharlie Swanson <charlie.swanson@mongodb.com>2018-11-19 09:47:43 -0500
commit794e75a24d975f80317cf92c004cf5cb9ea5b03d (patch)
tree8c52ccf651f9bfb65268e6d5c0f7df4abd0127ae /buildscripts
parent48d8edbb70092231c0f7c6c4c59af5c6e38a9781 (diff)
downloadmongo-794e75a24d975f80317cf92c004cf5cb9ea5b03d.tar.gz
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. (cherry picked from commit 7dbcd710077bc4141e71730be9e12558880375e6)
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml6
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml2
3 files changed, 4 insertions, 7 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
index c9e746bf608..8645977494d 100644
--- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
@@ -96,12 +96,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 ba2638fbe0f..6648bac3175 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
@@ -100,7 +100,8 @@ selector:
- jstests/sharding/find_getmore_cmd.js
- jstests/sharding/move_chunk_open_cursors.js
- jstests/sharding/validate_collection.js
-
+ # Enable if SERVER-36966 is backported to v3.6
+ - jstests/sharding/mr_output_sharded_validation.js
executor:
config:
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 ba3b54198d1..2cea86e1fa1 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
@@ -436,6 +436,8 @@ selector:
- jstests/sharding/lookup_change_stream_post_image_hashed_shard_key.js
- jstests/sharding/lookup_change_stream_post_image_id_shard_key.js
- jstests/sharding/resume_change_stream_from_stale_mongos.js
+ # Enable if SERVER-36966 is backported to v3.6.
+ - jstests/sharding/mr_output_sharded_validation.js
executor:
config: