summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorJonathan Abrahams <jonathan@mongodb.com>2016-08-18 16:44:57 -0400
committerJonathan Abrahams <jonathan@mongodb.com>2016-08-18 16:44:57 -0400
commit45d31b50bd1669116248bae73d25769505e62acb (patch)
treeb2e5b738c2df3fd92fec5067168548cbfe6c9edc /buildscripts
parentefb09f95f1bea9a7f749b99949860743ba970f8d (diff)
downloadmongo-45d31b50bd1669116248bae73d25769505e62acb.tar.gz
Revert "SERVER-24248 Run multiversion tests with different storage engines"
This reverts commit 2f02928e5726c66ff153f6b0b8bd5711e5203963.
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, 2 insertions, 18 deletions
diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml
index 95c81adcc12..f38be92e75f 100644
--- a/buildscripts/resmokeconfig/suites/multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion.yml
@@ -2,11 +2,8 @@ selector:
js_test:
roots:
- jstests/multiVersion/*.js
- exclude_files:
- # Multi storageEngine tests
- - jstests/multiVersion/mixed_storage_version_replication.js
- - jstests/multiVersion/transitioning_to_and_from_WT.js
- # TODO: SERVER-21578
+ exclude_files:
+# 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
deleted file mode 100644
index 855720d8e43..00000000000
--- a/buildscripts/resmokeconfig/suites/multiversion_multistorage_engine.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-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: ''