summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorCheahuychou Mao <cheahuychou.mao@mongodb.com>2018-07-10 16:14:17 -0400
committerCheahuychou Mao <cheahuychou.mao@mongodb.com>2018-08-15 15:41:04 -0400
commit908bafa8135b152baebb3f0e2db32a704b80fecd (patch)
tree8650a2fbdc53c2c5502a25a7f20aad414ae68e82 /buildscripts
parented04908ffce0e6d53f0982827e7c988b54cd1940 (diff)
downloadmongo-908bafa8135b152baebb3f0e2db32a704b80fecd.tar.gz
SERVER-35794 Validate shard key against existing zones
(cherry picked from commit e7736e0424eccf99431cc302447dad7fc2f14c4d)
Diffstat (limited to 'buildscripts')
-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.yml3
-rw-r--r--buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j23
3 files changed, 9 insertions, 0 deletions
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 b778cffed41..6243f380253 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
@@ -61,6 +61,9 @@ selector:
- jstests/sharding/max_time_ms_sharded.js
# Requires killOp to work for local operations on mongos, introduced in v4.0.
- jstests/sharding/killop.js
+ # Requires shardCollection command to validate shard key against existing
+ # zones, introduced in v4.0.
+ - jstests/sharding/shard_collection_existing_zones.js
# New 4.0 feature
- jstests/sharding/change_stream_lookup_single_shard_cluster.js
- jstests/sharding/change_stream_metadata_notifications.js
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 674f240f340..2662e52839c 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
@@ -421,6 +421,9 @@ selector:
- jstests/sharding/movechunk_include.js
# Enable when SERVER-33538 is backported.
- jstests/sharding/mapReduce_outSharded_checkUUID.js
+ # Requires shardCollection command to validate shard key against existing
+ # zones, introduced in v4.0.
+ - jstests/sharding/shard_collection_existing_zones.js
# TODO SERVER-34204: Change streams established in a session can send getMores without logical
# session ids. Enable when SERVER-34204 is backported to v3.6.
- jstests/sharding/change_stream_chunk_migration.js
diff --git a/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2 b/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2
index 4d19eb1b2c1..9d6001b24a4 100644
--- a/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2
+++ b/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2
@@ -77,6 +77,9 @@ selector:
- jstests/sharding/max_time_ms_sharded.js
# Requires killOp to work for local operations on mongos, introduced in v4.0.
- jstests/sharding/killop.js
+ # Requires shardCollection command to validate shard key against existing
+ # zones, introduced in v4.0.
+ - jstests/sharding/shard_collection_existing_zones.js
# New 4.0 feature
- jstests/sharding/change_stream_lookup_single_shard_cluster.js
- jstests/sharding/change_streams_unsharded_becomes_sharded.js