summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Hirschhorn <max.hirschhorn@mongodb.com>2020-02-14 20:10:14 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-02-15 01:22:30 +0000
commit3029652f44de02be3da3f40daf3376d170ffcf70 (patch)
tree97f82dfcd904741ff009563848a7b38567bdfe64
parentee466720d56ceb1e32abe2636b26cb0d2facd8d9 (diff)
downloadmongo-3029652f44de02be3da3f40daf3376d170ffcf70.tar.gz
SERVER-46178 Exclude requires_sharding tests from ephemeralForTest.
-rw-r--r--etc/evergreen.yml2
-rw-r--r--jstests/auth/upgrade_noauth_to_keyfile_with_sharding.js2
-rw-r--r--jstests/gle/gle_sharded_write.js3
3 files changed, 5 insertions, 2 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 9107d7d4fed..0f108298882 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -11600,7 +11600,7 @@ buildvariants:
expansions:
# Transactions are not explicitly supported on the ephemeralForTest storage engine.
# Speculative majority reads are currently only allowed for change streams, which are only supported on WiredTiger.
- test_flags: --storageEngine=ephemeralForTest --excludeWithAnyTags=requires_persistence,requires_fsync,SERVER-21420,SERVER-21658,requires_journaling,requires_wiredtiger,uses_transactions,requires_document_locking,uses_speculative_majority,requires_snapshot_read,requires_majority_read_concern,uses_change_streams
+ test_flags: --storageEngine=ephemeralForTest --excludeWithAnyTags=requires_persistence,requires_fsync,SERVER-21420,SERVER-21658,requires_journaling,requires_wiredtiger,uses_transactions,requires_document_locking,uses_speculative_majority,requires_snapshot_read,requires_majority_read_concern,uses_change_streams,requires_sharding
compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --dbg=off --opt=on --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
multiversion_platform: rhel62
multiversion_edition: targeted
diff --git a/jstests/auth/upgrade_noauth_to_keyfile_with_sharding.js b/jstests/auth/upgrade_noauth_to_keyfile_with_sharding.js
index 17728c1ae4e..9047c2cddef 100644
--- a/jstests/auth/upgrade_noauth_to_keyfile_with_sharding.js
+++ b/jstests/auth/upgrade_noauth_to_keyfile_with_sharding.js
@@ -1,6 +1,6 @@
// Tests access control upgrade on a sharded cluster
// The purpose is to verify the connectivity between mongos, config server, and the shards
-// @tags: [requires_sharding, requires_document_locking]
+// @tags: [requires_sharding]
load('jstests/ssl/libs/ssl_helpers.js');
diff --git a/jstests/gle/gle_sharded_write.js b/jstests/gle/gle_sharded_write.js
index b67ab34ec1a..21a42381c96 100644
--- a/jstests/gle/gle_sharded_write.js
+++ b/jstests/gle/gle_sharded_write.js
@@ -2,6 +2,9 @@
// Ensures GLE correctly reports basic write stats and failures
// Note that test should work correctly with and without write commands.
//
+// @tags: [
+// requires_sharding,
+// ]
// Checking UUID and index consistency involves talking to shards, but this test shuts down one
// shard.