summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bradford <david.bradford@mongodb.com>2018-06-15 14:11:25 -0400
committerDavid Bradford <david.bradford@mongodb.com>2018-06-15 14:45:23 -0400
commitb9e4d40b6254e0c5e6869a27da6f6ca30fac5d6c (patch)
tree8dabae060b2cec84d33dff41c816484cd074cc5b
parent37b377eb0eb350c0ed7620d31534640744efbd89 (diff)
downloadmongo-b9e4d40b6254e0c5e6869a27da6f6ca30fac5d6c.tar.gz
SERVER-35622: Move blacklisted tests to exclude_files section of yml
(cherry picked from commit a247dcc700921128fe093560a89f681632ba348c)
-rw-r--r--buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml7
-rw-r--r--buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml7
-rw-r--r--buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml7
-rw-r--r--buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml7
4 files changed, 16 insertions, 12 deletions
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
index bbb96dc0008..516c88db77d 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
@@ -111,13 +111,14 @@ selector:
# stagedebug can only be run against a standalone mongod
- jstests/concurrency/fsm_workloads/yield_and_hashed.js
- jstests/concurrency/fsm_workloads/yield_and_sorted.js
- exclude_with_any_tags:
- - uses_transactions
- - requires_replication
# TODO Unblacklist (SERVER-35538).
- jstests/concurrency/fsm_workloads/database_versioning.js
+ exclude_with_any_tags:
+ - uses_transactions
+ - requires_replication
+
executor:
archive:
hooks:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
index 434bdbe5555..7679a2e4285 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
@@ -118,14 +118,15 @@ selector:
# stagedebug can only be run against a standalone mongod
- jstests/concurrency/fsm_workloads/yield_and_hashed.js
- jstests/concurrency/fsm_workloads/yield_and_sorted.js
+
+ # TODO Unblacklist (SERVER-35538).
+ - jstests/concurrency/fsm_workloads/database_versioning.js
+
exclude_with_any_tags:
- uses_transactions
- assumes_balancer_off
- requires_replication
- # TODO Unblacklist (SERVER-35538).
- - jstests/concurrency/fsm_workloads/database_versioning.js
-
executor:
archive:
hooks:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
index e9af8074605..65965efe66c 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
@@ -108,13 +108,14 @@ selector:
# stagedebug can only be run against a standalone mongod
- jstests/concurrency/fsm_workloads/yield_and_hashed.js
- jstests/concurrency/fsm_workloads/yield_and_sorted.js
- exclude_with_any_tags:
- - uses_transactions
- - requires_replication
# TODO Unblacklist (SERVER-35538).
- jstests/concurrency/fsm_workloads/database_versioning.js
+ exclude_with_any_tags:
+ - uses_transactions
+ - requires_replication
+
executor:
archive:
hooks:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
index c1be2108abd..285f02e8369 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
@@ -115,14 +115,15 @@ selector:
# stagedebug can only be run against a standalone mongod
- jstests/concurrency/fsm_workloads/yield_and_hashed.js
- jstests/concurrency/fsm_workloads/yield_and_sorted.js
+
+ # TODO Unblacklist (SERVER-35538).
+ - jstests/concurrency/fsm_workloads/database_versioning.js
+
exclude_with_any_tags:
- uses_transactions
- assumes_balancer_off
- requires_replication
- # TODO Unblacklist (SERVER-35538).
- - jstests/concurrency/fsm_workloads/database_versioning.js
-
executor:
archive:
hooks: