summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorjannaerin <golden.janna@gmail.com>2018-03-06 15:43:19 -0500
committerjannaerin <golden.janna@gmail.com>2018-03-21 20:17:13 -0400
commitff5abfee3587ade3501c4fdc2594bc53b492c08e (patch)
treeb9820bd36772a253a3717f54f626ad816e038da5 /buildscripts
parent8560ff52901092fb22a61e998de84ce4ace307f5 (diff)
downloadmongo-ff5abfee3587ade3501c4fdc2594bc53b492c08e.tar.gz
SERVER-32847: Make copyDb transfer UUIDs when creating collections
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml1
2 files changed, 3 insertions, 2 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
index 869b3338a21..9f88b7be2c6 100644
--- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
@@ -82,7 +82,6 @@ selector:
- jstests/sharding/sharding_rs1.js
# Calls the config server primary directly (not through mongos)
- jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js
- - jstests/sharding/moveprimary_ignore_sharded.js
- jstests/sharding/min_optime_recovery_on_successful_move_chunk_commit.js
- jstests/sharding/read_after_optime.js
- jstests/sharding/server_status.js
@@ -159,6 +158,9 @@ selector:
- jstests/sharding/regex_targeting.js
# Sets a failpoint on a config server secondary.
- jstests/sharding/shards_and_config_return_last_committed_optime.js
+ # Calls movePrimary after data has been inserted into an unsharded collection, so will fail if
+ # a stepdown causes the command to be sent again.
+ - jstests/sharding/move_primary_clone_test.js
executor:
config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
index 16dd9b20d5a..a58ef79d21a 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
@@ -27,7 +27,6 @@ selector:
- jstests/sharding/geo_near_sort.js
- jstests/sharding/basic_drop_coll.js
- jstests/sharding/commands_that_write_accept_wc_configRS.js
- - jstests/sharding/clone_metadata_only.js
- jstests/sharding/kill_pinned_cursor.js
- jstests/sharding/movechunk_commit_changelog_stats.js
# Enable when 3.6 becomes last-stable.