summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorSpencer T Brody <spencer@mongodb.com>2015-12-14 18:00:17 -0500
committerSpencer T Brody <spencer@mongodb.com>2016-01-07 13:48:15 -0500
commitafadb50a096e27158cab38d2eb2bd3e445b09eab (patch)
tree44486274047afeae36679699482568def9a8239b /buildscripts
parentbb7843292edd321efd8806356e0842c2d87e8bcf (diff)
downloadmongo-afadb50a096e27158cab38d2eb2bd3e445b09eab.tar.gz
SERVER-20694 Catch IncompatibleCatalogManager errors in cluster find code
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/sharding.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_auth.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_auth_audit.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_ese.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_legacy.yml1
5 files changed, 0 insertions, 5 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding.yml b/buildscripts/resmokeconfig/suites/sharding.yml
index cb084fdbf8d..c1a9b396fd1 100644
--- a/buildscripts/resmokeconfig/suites/sharding.yml
+++ b/buildscripts/resmokeconfig/suites/sharding.yml
@@ -4,7 +4,6 @@ selector:
- jstests/sharding/*.js
- jstests/sharding/replset_config/*.js
exclude_files:
- - jstests/sharding/csrs_upgrade.js # SERVER-20694
- jstests/sharding/csrs_upgrade_during_migrate.js # flaky - SERVER-20580
executor:
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth.yml b/buildscripts/resmokeconfig/suites/sharding_auth.yml
index 39f36e53586..f3e1e8df86d 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth.yml
@@ -10,7 +10,6 @@ selector:
- jstests/sharding/replset_config/*.js
- jstests/sharding/sync_cluster_config/*.js
exclude_files:
- - jstests/sharding/csrs_upgrade.js # SERVER-20694
- jstests/sharding/csrs_upgrade_during_migrate.js # flaky - SERVER-20580
# Skip any tests that run with auth explicitly.
- jstests/sharding/*[aA]uth*.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
index f5a65432ce7..dc9ad86be84 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
@@ -10,7 +10,6 @@ selector:
- jstests/sharding/replset_config/*.js
- jstests/sharding/sync_cluster_config/*.js
exclude_files:
- - jstests/sharding/csrs_upgrade.js # SERVER-20694
- jstests/sharding/csrs_upgrade_during_migrate.js # flaky - SERVER-20580
# Skip any tests that run with auth explicitly.
- jstests/sharding/*[aA]uth*.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_ese.yml b/buildscripts/resmokeconfig/suites/sharding_ese.yml
index 2c6887ba8bf..af63a4f4f75 100644
--- a/buildscripts/resmokeconfig/suites/sharding_ese.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_ese.yml
@@ -8,7 +8,6 @@ selector:
- jstests/sharding/*.js
- jstests/sharding/replset_config/*.js
exclude_files:
- - jstests/sharding/csrs_upgrade.js # SERVER-20694
- jstests/sharding/csrs_upgrade_during_migrate.js # flaky - SERVER-20580
executor:
diff --git a/buildscripts/resmokeconfig/suites/sharding_legacy.yml b/buildscripts/resmokeconfig/suites/sharding_legacy.yml
index 54021acd2b5..2d59cba5119 100644
--- a/buildscripts/resmokeconfig/suites/sharding_legacy.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_legacy.yml
@@ -4,7 +4,6 @@ selector:
- jstests/sharding/*.js
- jstests/sharding/sync_cluster_config/*.js
exclude_files:
- - jstests/sharding/csrs_upgrade.js # SERVER-20694
- jstests/sharding/csrs_upgrade_during_migrate.js # SERVER-20580
executor: