diff options
| author | jannaerin <golden.janna@gmail.com> | 2019-06-27 13:53:38 -0400 |
|---|---|---|
| committer | jannaerin <golden.janna@gmail.com> | 2019-07-17 13:26:03 -0400 |
| commit | 27079c53fa994874272ea35d6148c0cd878316aa (patch) | |
| tree | 2b4bd75610faa7475039d6d3217a2910b1d1ef17 /buildscripts | |
| parent | 56f7aa61a37580a973adca93a939cf969d9130d8 (diff) | |
| download | mongo-27079c53fa994874272ea35d6148c0cd878316aa.tar.gz | |
SERVER-41950 MongoS should attach dbVersion on agg path when collection is unsharded
Diffstat (limited to 'buildscripts')
8 files changed, 21 insertions, 0 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding.yml b/buildscripts/resmokeconfig/suites/sharding.yml index ce952617352..f3e764bbf0c 100644 --- a/buildscripts/resmokeconfig/suites/sharding.yml +++ b/buildscripts/resmokeconfig/suites/sharding.yml @@ -3,6 +3,9 @@ test_kind: js_test selector: roots: - jstests/sharding/*.js + exclude_files: + # Aggregation with $merge will fail until SERVER-41949 is finished. + - jstests/sharding/merge_with_move_primary.js executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharding_auth.yml b/buildscripts/resmokeconfig/suites/sharding_auth.yml index 5f361dd80cb..21e31d4b64b 100644 --- a/buildscripts/resmokeconfig/suites/sharding_auth.yml +++ b/buildscripts/resmokeconfig/suites/sharding_auth.yml @@ -32,6 +32,8 @@ selector: - jstests/sharding/migration_critical_section_concurrency.js # SERVER-21713 # Runs with auth enabled. - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js + # Aggregation with $merge will fail until SERVER-41949 is finished. + - jstests/sharding/merge_with_move_primary.js executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml index 25cf393d692..1ad84f7888a 100644 --- a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml +++ b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml @@ -32,6 +32,8 @@ selector: - jstests/sharding/migration_critical_section_concurrency.js # SERVER-21713 # Runs with auth enabled. - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js + # Aggregation with $merge will fail until SERVER-41949 is finished. + - jstests/sharding/merge_with_move_primary.js executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml index 46d6f057004..4681072f81a 100644 --- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml +++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml @@ -201,6 +201,8 @@ selector: - jstests/sharding/sharding_statistics_server_status.js # setShardVersion is not robust during config server stepdown. - jstests/sharding/mongos_no_detect_sharding.js + # Aggregation with $merge will fail until SERVER-41949 is finished. + - jstests/sharding/merge_with_move_primary.js executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharding_ese.yml b/buildscripts/resmokeconfig/suites/sharding_ese.yml index d8d620384a1..e65283c6db0 100644 --- a/buildscripts/resmokeconfig/suites/sharding_ese.yml +++ b/buildscripts/resmokeconfig/suites/sharding_ese.yml @@ -7,6 +7,9 @@ test_kind: js_test selector: roots: - jstests/sharding/*.js + exclude_files: + # Aggregation with $merge will fail until SERVER-41949 is finished. + - jstests/sharding/merge_with_move_primary.js executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml b/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml index 23e5a9b091d..a02f5d66113 100644 --- a/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml +++ b/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml @@ -7,6 +7,9 @@ test_kind: js_test selector: roots: - jstests/sharding/*.js + exclude_files: + # Aggregation with $merge will fail until SERVER-41949 is finished. + - jstests/sharding/merge_with_move_primary.js executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharding_rs_matching_disabled.yml b/buildscripts/resmokeconfig/suites/sharding_rs_matching_disabled.yml index f159ca35e52..df1687716b4 100644 --- a/buildscripts/resmokeconfig/suites/sharding_rs_matching_disabled.yml +++ b/buildscripts/resmokeconfig/suites/sharding_rs_matching_disabled.yml @@ -3,6 +3,9 @@ test_kind: js_test selector: roots: - jstests/sharding/*.js + exclude_files: + # Aggregation with $merge will fail until SERVER-41949 is finished. + - jstests/sharding/merge_with_move_primary.js executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharding_rs_matching_match_busiest_node.yml b/buildscripts/resmokeconfig/suites/sharding_rs_matching_match_busiest_node.yml index 5aefdbbe4ec..40ebba8c625 100644 --- a/buildscripts/resmokeconfig/suites/sharding_rs_matching_match_busiest_node.yml +++ b/buildscripts/resmokeconfig/suites/sharding_rs_matching_match_busiest_node.yml @@ -3,6 +3,9 @@ test_kind: js_test selector: roots: - jstests/sharding/*.js + exclude_files: + # Aggregation with $merge will fail until SERVER-41949 is finished. + - jstests/sharding/merge_with_move_primary.js executor: config: |