summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorDavid Storch <david.storch@10gen.com>2016-09-21 18:44:56 -0400
committerDavid Storch <david.storch@10gen.com>2016-09-22 18:41:37 -0400
commite114f74a9b3bf087f15dfbee5d7250b2839308e7 (patch)
tree75e3c02701ceebdd7b707aa37a32340495ec2b15 /buildscripts
parent64819b40303060951f8b0c27b94d52d2dd04eed7 (diff)
downloadmongo-e114f74a9b3bf087f15dfbee5d7250b2839308e7.tar.gz
SERVER-25158 prevent 3.2 mongos from connecting to a featureCompatibilityVersion 3.4 config serverr3.3.13
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/multiversion.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml5
2 files changed, 8 insertions, 0 deletions
diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml
index 95c81adcc12..c97b6fc8d98 100644
--- a/buildscripts/resmokeconfig/suites/multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion.yml
@@ -8,6 +8,9 @@ selector:
- jstests/multiVersion/transitioning_to_and_from_WT.js
# TODO: SERVER-21578
- jstests/multiVersion/balancer_multiVersion_detect.js
+ # TODO: SERVER-26261
+ - jstests/multiVersion/2_test_launching_cluster.js
+ - jstests/multiVersion/dumprestore_sharded.js
# Multiversion tests start their own mongod's.
executor:
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 e7b5b9fbef7..97753edcf7b 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
@@ -66,6 +66,11 @@ selector:
# Testing features that do not exist on v3.2 shards.
- jstests/sharding/migration_server_status.js
- jstests/sharding/movechunk_parallel.js
+ # These tests do not use ShardingTest which handles setting the featureCompatibilityVersion to
+ # 3.2 when in a mixed configuration. Enable when 3.4 becomes last-stable.
+ - jstests/sharding/autodiscover_config_rs_from_secondary.js
+ - jstests/sharding/config_rs_change.js
+ - jstests/sharding/mongos_wait_csrs_initiate.js
executor:
js_test: