summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorSpencer T Brody <spencer@mongodb.com>2016-01-06 15:21:55 -0500
committerSpencer T Brody <spencer@mongodb.com>2016-01-07 14:45:07 -0500
commit43209263a40af233dd1fae25aa719c7b2b304480 (patch)
tree74e1502e3bb2b3388b2c76a783d39f829ff0aa31 /buildscripts
parent7f6f5f4248e22857749382b72527581346d6b6fc (diff)
downloadmongo-43209263a40af233dd1fae25aa719c7b2b304480.tar.gz
SERVER-20580 Re-enable csrs_upgrade_during_migrate.js test
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_continuous_config_stepdown.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_ese.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_legacy.yml1
6 files changed, 0 insertions, 9 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding.yml b/buildscripts/resmokeconfig/suites/sharding.yml
index c1a9b396fd1..df7aabd83e5 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_during_migrate.js # flaky - SERVER-20580
executor:
js_test:
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth.yml b/buildscripts/resmokeconfig/suites/sharding_auth.yml
index f3e1e8df86d..a114442e28a 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_during_migrate.js # flaky - SERVER-20580
# Skip any tests that run with auth explicitly.
- jstests/sharding/*[aA]uth*.js
- jstests/sharding/replset_config/*[aA]uth*.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
index dc9ad86be84..b8845773d5c 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_during_migrate.js # flaky - SERVER-20580
# Skip any tests that run with auth explicitly.
- jstests/sharding/*[aA]uth*.js
- jstests/sharding/replset_config/*[aA]uth*.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
index f47d7ec62d1..0371703ac10 100644
--- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
@@ -4,10 +4,6 @@ selector:
- jstests/sharding/*.js
- jstests/sharding/replset_config/*.js
exclude_files:
- # SERVER-20694
- - jstests/sharding/csrs_upgrade.js
- # Test is flaky - SERVER-20580
- - jstests/sharding/csrs_upgrade_during_migrate.js
# Auth tests require authentication on the stepdown thread's connection
- jstests/sharding/auth*.js
- jstests/sharding/cleanup_orphaned_auth.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_ese.yml b/buildscripts/resmokeconfig/suites/sharding_ese.yml
index af63a4f4f75..1e431841c9c 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_during_migrate.js # flaky - SERVER-20580
executor:
js_test:
diff --git a/buildscripts/resmokeconfig/suites/sharding_legacy.yml b/buildscripts/resmokeconfig/suites/sharding_legacy.yml
index 2d59cba5119..716e59ba2bb 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_during_migrate.js # SERVER-20580
executor:
js_test: