summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorMarcos José Grillo Ramírez <marcos.grillo@10gen.com>2019-11-07 17:52:41 +0000
committerevergreen <evergreen@mongodb.com>2019-11-07 17:52:41 +0000
commit253e674104d298e2f6882b5c8207a2058e648b42 (patch)
tree52e2a1b32da08fab7fcfbef495ebe5a32da2f120 /buildscripts
parent0d5240e8af0e9aa7c29c45138f6054c761a2a178 (diff)
downloadmongo-253e674104d298e2f6882b5c8207a2058e648b42.tar.gz
SERVER-31083 Allow passing primary shard to "enableSharding" command for a new database
(cherry picked from commit 6ef06c9093462bec22c2219c341b0219f1864cca) (cherry picked from commit 89a83b368a3d71fcf47ced4245235ccbb7b6961c)
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_misc.yml1
2 files changed, 3 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 384459fe07e..570dcfd1c78 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
@@ -109,6 +109,8 @@ selector:
- jstests/sharding/shard_collection_existing_zones.js
# Enable when BACKPORT-4652 is released to v3.6
- jstests/sharding/server_status_crud_metrics.js
+ # Enable after SERVER-31083 is backported and available on 4.2 and 4.0 binaries
+ - jstests/sharding/enable_sharding_with_primary.js
executor:
config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_misc.yml b/buildscripts/resmokeconfig/suites/sharding_misc.yml
index ee21cfff768..beb49ad2419 100644
--- a/buildscripts/resmokeconfig/suites/sharding_misc.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_misc.yml
@@ -224,6 +224,7 @@ selector:
- jstests/sharding/findandmodify1.js
- jstests/sharding/move_chunk_missing_idx.js
- jstests/sharding/enable_sharding_basic.js
+ - jstests/sharding/enable_sharding_with_primary.js
- jstests/sharding/inserts_consistent.js
- jstests/sharding/shard4.js
- jstests/sharding/migration_with_source_ops.js