summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorJames Wahlin <james.wahlin@mongodb.com>2019-12-13 15:13:12 +0000
committerevergreen <evergreen@mongodb.com>2019-12-13 15:13:12 +0000
commit4abca26280003a57133d6d2ea9f2c03c03291e47 (patch)
treed07ab9959a124ce3519445d81bdd1bba5d4a3e82 /buildscripts
parent8c4c6cc2b5e3818873b9dadcedd029839b5dc550 (diff)
downloadmongo-4abca26280003a57133d6d2ea9f2c03c03291e47.tar.gz
SERVER-32567 Replace queryoptimizer3.js with yield_with_drop.js FSM test
(cherry picked from commit d86e8a5bf40f1c6edbab37bef38cd0f1d5dc062d) (cherry picked from commit b5a58d9c335857ab1d414f4f48574e514f640b59)
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml2
4 files changed, 2 insertions, 3 deletions
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml
index e9cb1438105..b21ac6415f0 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml
@@ -149,6 +149,7 @@ selector:
- jstests/concurrency/fsm_workloads/yield_sort.js
- jstests/concurrency/fsm_workloads/yield_sort_merge.js
- jstests/concurrency/fsm_workloads/yield_text.js
+ - jstests/concurrency/fsm_workloads/yield_with_drop.js
# Uses non retryable writes.
- jstests/concurrency/fsm_workloads/remove_and_bulk_insert.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml
index 3f470834855..27220a086c4 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml
@@ -155,6 +155,7 @@ selector:
- jstests/concurrency/fsm_workloads/yield_sort.js
- jstests/concurrency/fsm_workloads/yield_sort_merge.js
- jstests/concurrency/fsm_workloads/yield_text.js
+ - jstests/concurrency/fsm_workloads/yield_with_drop.js
# Uses non retryable writes.
- jstests/concurrency/fsm_workloads/remove_and_bulk_insert.js
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
index 74b459306d9..7a3f0037aa4 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
@@ -262,7 +262,6 @@ selector:
- jstests/core/killop_drop_collection.js
- jstests/core/loadserverscripts.js
- jstests/core/mr_killop.js
- - jstests/core/queryoptimizer3.js
- jstests/core/remove9.js
- jstests/core/removeb.js
- jstests/core/removec.js
diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
index aa24ddbc2ef..7cabd405368 100644
--- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
@@ -77,8 +77,6 @@ selector:
- jstests/core/mr1.js
- jstests/core/mr3.js
- jstests/core/mr4.js
- # TODO: SERVER-30052
- - jstests/core/queryoptimizer3.js
# TODO: SERVER-27269: mongos can't establish cursor if view has $collStats and views another view.
- jstests/core/views/views_coll_stats.js
# Tests that won't work with an injected 'majority' readConcern