summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorJonathan Abrahams <jonathan@mongodb.com>2016-08-25 09:40:16 -0400
committerJonathan Abrahams <jonathan@mongodb.com>2016-08-25 09:40:16 -0400
commit657074a4ea7219886f35124632a2f3c8da4513d0 (patch)
tree5574b63300ba5e68da313a5877d073c823ded664 /buildscripts
parent15050f49369d8972ae87444df760e78996309fdc (diff)
downloadmongo-657074a4ea7219886f35124632a2f3c8da4513d0.tar.gz
SERVER-24248 Run multiversion tests with different storage engines
This reverts commit 45d31b50bd1669116248bae73d25769505e62acb.
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/multiversion.yml7
-rw-r--r--buildscripts/resmokeconfig/suites/multiversion_multistorage_engine.yml13
2 files changed, 18 insertions, 2 deletions
diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml
index f38be92e75f..95c81adcc12 100644
--- a/buildscripts/resmokeconfig/suites/multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion.yml
@@ -2,8 +2,11 @@ selector:
js_test:
roots:
- jstests/multiVersion/*.js
- exclude_files:
-# TODO: SERVER-21578
+ exclude_files:
+ # Multi storageEngine tests
+ - jstests/multiVersion/mixed_storage_version_replication.js
+ - jstests/multiVersion/transitioning_to_and_from_WT.js
+ # TODO: SERVER-21578
- jstests/multiVersion/balancer_multiVersion_detect.js
# Multiversion tests start their own mongod's.
diff --git a/buildscripts/resmokeconfig/suites/multiversion_multistorage_engine.yml b/buildscripts/resmokeconfig/suites/multiversion_multistorage_engine.yml
new file mode 100644
index 00000000000..855720d8e43
--- /dev/null
+++ b/buildscripts/resmokeconfig/suites/multiversion_multistorage_engine.yml
@@ -0,0 +1,13 @@
+selector:
+ js_test:
+ roots:
+ - jstests/multiVersion/mixed_storage_version_replication.js
+ - jstests/multiVersion/transitioning_to_and_from_WT.js
+
+# Multiversion tests start their own mongod's.
+executor:
+ js_test:
+ config:
+ shell_options:
+ eval: "load('jstests/libs/override_methods/multiversion_override_balancer_control.js');"
+ nodb: ''