SERVER-36083 Added evergreen variant with enableMajorityReadConcern set to false.

38 files changed, 40 insertions, 7 deletions

diff --git a/jstests/multiVersion/causal_consistency_downgrade_cluster.js b/jstests/multiVersion/causal_consistency_downgrade_cluster.js
index c23ff0023bf..e45dba25306 100644
--- a/jstests/multiVersion/causal_consistency_downgrade_cluster.js
+++ b/jstests/multiVersion/causal_consistency_downgrade_cluster.js
@@ -1,6 +1,7 @@
 /**
  * Test the downgrade of a sharded cluster from latest to last-stable version succeeds, verifying
  * behavior related to causal consistency at each stage.
+ * @tags: [requires_majority_read_concern]
  */
 (function() {
     "use strict";
diff --git a/jstests/multiVersion/causal_consistency_upgrade_cluster.js b/jstests/multiVersion/causal_consistency_upgrade_cluster.js
index 9f5c2d98414..39c8c812554 100644
--- a/jstests/multiVersion/causal_consistency_upgrade_cluster.js
+++ b/jstests/multiVersion/causal_consistency_upgrade_cluster.js
@@ -2,6 +2,7 @@
  * Tests upgrading a cluster with two shards and two mongos servers from last stable to current
  * version, verifying the behavior of $clusterTime metadata and afterClusterTime commands throughout
  * the process.
+ * @tags: [requires_majority_read_concern]
  */
 (function() {
     "use strict";
diff --git a/jstests/noPassthrough/after_cluster_time.js b/jstests/noPassthrough/after_cluster_time.js
index 9bcf4598ecb..53e544bb57b 100644
--- a/jstests/noPassthrough/after_cluster_time.js
+++ b/jstests/noPassthrough/after_cluster_time.js
@@ -1,4 +1,5 @@
 // This test verifies readConcern:afterClusterTime behavior on a standalone mongod.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
     var standalone =
diff --git a/jstests/noPassthrough/agg_explain_read_concern.js b/jstests/noPassthrough/agg_explain_read_concern.js
index c3178d20c49..49e098735fe 100644
--- a/jstests/noPassthrough/agg_explain_read_concern.js
+++ b/jstests/noPassthrough/agg_explain_read_concern.js
@@ -1,5 +1,6 @@
 /**
  * Test that explained aggregation commands behave correctly with the readConcern option.
+ * @tags: [requires_majority_read_concern]
  */
 (function() {
     "use strict";
diff --git a/jstests/noPassthrough/causal_consistency_feature_compatibility.js b/jstests/noPassthrough/causal_consistency_feature_compatibility.js
index 91c97f1cb64..cf7f613c26a 100644
--- a/jstests/noPassthrough/causal_consistency_feature_compatibility.js
+++ b/jstests/noPassthrough/causal_consistency_feature_compatibility.js
@@ -1,6 +1,7 @@
 /**
  * Tests the behavior of a sharded cluster when featureCompatibilityVersion is set to 3.4, with
  * respect to causal consistency. In noPassthrough to avoid issues with auth.
+ * @tags: [requires_majority_read_concern]
  */
 (function() {
     "use strict";
diff --git a/jstests/noPassthrough/change_stream_feature_compatibility_version.js b/jstests/noPassthrough/change_stream_feature_compatibility_version.js
index c698176e946..1bbf312650c 100644
--- a/jstests/noPassthrough/change_stream_feature_compatibility_version.js
+++ b/jstests/noPassthrough/change_stream_feature_compatibility_version.js
@@ -1,5 +1,6 @@
 // Test that $changeStreams usage is disallowed when the featureCompatibilityVersion is 3.4.
 // and that existing streams close when FCV is set to 3.4
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/noPassthrough/change_streams_require_majority_read_concern.js b/jstests/noPassthrough/change_streams_require_majority_read_concern.js
index df2bdd61e2e..126c7100484 100644
--- a/jstests/noPassthrough/change_streams_require_majority_read_concern.js
+++ b/jstests/noPassthrough/change_streams_require_majority_read_concern.js
@@ -1,4 +1,5 @@
 // Tests that the $changeStream requires read concern majority.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/noPassthrough/change_streams_update_lookup_collation.js b/jstests/noPassthrough/change_streams_update_lookup_collation.js
index 121a41c53bd..f3914b2a272 100644
--- a/jstests/noPassthrough/change_streams_update_lookup_collation.js
+++ b/jstests/noPassthrough/change_streams_update_lookup_collation.js
@@ -2,7 +2,7 @@
 // collation, regardless of the collation on the change stream.
 //
 // Collation is only supported with the find command, not with op query.
-// @tags: [requires_find_command]
+// @tags: [requires_find_command, requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/noPassthrough/command_line_parsing.js b/jstests/noPassthrough/command_line_parsing.js
index bd1b1ff0e8b..c68b050a676 100644
--- a/jstests/noPassthrough/command_line_parsing.js
+++ b/jstests/noPassthrough/command_line_parsing.js
@@ -35,6 +35,7 @@ delete m2result.parsed.storage.engine;
 delete m2result.parsed.storage.journal;
 delete m2result.parsed.storage.rocksdb;
 delete m2result.parsed.storage.wiredTiger;
+delete m2result.parsed.replication;  // Removes enableMajorityReadConcern setting.
 assert.docEq(m2expected.parsed, m2result.parsed);
 
 // test JSON config file
@@ -62,4 +63,5 @@ delete m3result.parsed.storage.engine;
 delete m3result.parsed.storage.journal;
 delete m3result.parsed.storage.rocksdb;
 delete m3result.parsed.storage.wiredTiger;
+delete m3result.parsed.replication;  // Removes enableMajorityReadConcern setting.
 assert.docEq(m3expected.parsed, m3result.parsed);
diff --git a/jstests/noPassthrough/read_concern_helper.js b/jstests/noPassthrough/read_concern_helper.js
index 2f9e2c4807b..b83b48bdf34 100644
--- a/jstests/noPassthrough/read_concern_helper.js
+++ b/jstests/noPassthrough/read_concern_helper.js
@@ -1,4 +1,5 @@
 // This tests readConcern handling for the find/findOne shell helpers.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
     var testServer = MongoRunner.runMongod();
diff --git a/jstests/noPassthrough/read_majority.js b/jstests/noPassthrough/read_majority.js
index fd3ceb2c35a..35e4d584e4e 100644
--- a/jstests/noPassthrough/read_majority.js
+++ b/jstests/noPassthrough/read_majority.js
@@ -12,6 +12,7 @@
  *
  * All of this requires support for committed reads, so this test will be skipped if the storage
  * engine does not support them.
+ * @tags: [requires_majority_read_concern]
  */
 
 load("jstests/libs/analyze_plan.js");
diff --git a/jstests/noPassthrough/read_majority_reads.js b/jstests/noPassthrough/read_majority_reads.js
index 40172ff0909..a28667abf0d 100644
--- a/jstests/noPassthrough/read_majority_reads.js
+++ b/jstests/noPassthrough/read_majority_reads.js
@@ -14,6 +14,7 @@
  * Each operation is tested on a single node, and (if supported) through mongos on both sharded and
  * unsharded collections. Mongos doesn't directly handle readConcern majority, but these tests
  * should ensure that it correctly propagates the setting to the shards when running commands.
+ * @tags: [requires_majority_read_concern]
  */
 
 (function() {
diff --git a/jstests/noPassthrough/skip_sharding_configuration_checks.js b/jstests/noPassthrough/skip_sharding_configuration_checks.js
index 2dc096faf8e..bec83f082df 100644
--- a/jstests/noPassthrough/skip_sharding_configuration_checks.js
+++ b/jstests/noPassthrough/skip_sharding_configuration_checks.js
@@ -1,6 +1,6 @@
 /**
  *  Starts standalone RS with skipShardingConfigurationChecks.
- *  @tags: [requires_persistence]
+ *  @tags: [requires_persistence, requires_majority_read_concern]
  */
 (function() {
     'use strict';
diff --git a/jstests/noPassthrough/unsupported_change_stream_deployments.js b/jstests/noPassthrough/unsupported_change_stream_deployments.js
index 0f5ea72768f..294255e0a62 100644
--- a/jstests/noPassthrough/unsupported_change_stream_deployments.js
+++ b/jstests/noPassthrough/unsupported_change_stream_deployments.js
@@ -1,4 +1,5 @@
 // Tests that the $changeStream stage returns an error when run against a standalone mongod.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
     load("jstests/aggregation/extras/utils.js");  // For assertErrorCode.
diff --git a/jstests/replsets/command_response_operation_time.js b/jstests/replsets/command_response_operation_time.js
index cd889e0b090..d4aecdb2248 100644
--- a/jstests/replsets/command_response_operation_time.js
+++ b/jstests/replsets/command_response_operation_time.js
@@ -2,6 +2,7 @@
  * Tests that reads and writes in a replica set return the correct operationTime for their
  * read/write concern level. Majority reads and writes return the last committed optime's timestamp
  * and local reads and writes return the last applied optime's timestamp.
+ * @tags: [requires_majority_read_concern]
  */
 (function() {
     "use strict";
diff --git a/jstests/replsets/last_op_visible.js b/jstests/replsets/last_op_visible.js
index 743b1b1c4c1..c43c82673f1 100644
--- a/jstests/replsets/last_op_visible.js
+++ b/jstests/replsets/last_op_visible.js
@@ -3,6 +3,7 @@
 // lastOpVisible, and that majority read with afterOpTime of lastOpVisible will return it as well.
 // We then confirm that a writeConcern majority write will be seen as the lastVisibleOp by a
 // majority read.
+// @tags: [requires_majority_read_concern]
 
 load("jstests/replsets/rslib.js");
 
diff --git a/jstests/replsets/mmap_disallows_rc_majority.js b/jstests/replsets/mmap_disallows_rc_majority.js
index 59b5c9fdd4a..66999e4473f 100644
--- a/jstests/replsets/mmap_disallows_rc_majority.js
+++ b/jstests/replsets/mmap_disallows_rc_majority.js
@@ -8,6 +8,7 @@
  * read concern majority request.
  *
  * This test requires mmapv1, but does not rely on the tag to ensure this.
+ * @tags: [requires_mmapv1]
  */
 (function() {
     "use strict";
diff --git a/jstests/replsets/operation_time_read_and_write_concern.js b/jstests/replsets/operation_time_read_and_write_concern.js
index 235db85aab3..c1661db1d7e 100644
--- a/jstests/replsets/operation_time_read_and_write_concern.js
+++ b/jstests/replsets/operation_time_read_and_write_concern.js
@@ -1,6 +1,7 @@
 /**
  * Validates the operationTime value in the command response depends on the read/writeConcern of the
  * the read/write commmand that produced it.
+ * @tags: [requires_majority_read_concern]
  */
 (function() {
     "use strict";
diff --git a/jstests/replsets/read_concern_uninitated_set.js b/jstests/replsets/read_concern_uninitated_set.js
index 0a4aa87b0c4..83d455e66ad 100644
--- a/jstests/replsets/read_concern_uninitated_set.js
+++ b/jstests/replsets/read_concern_uninitated_set.js
@@ -2,7 +2,7 @@
  * Test to ensure that specifying non-local read concern with an uninitiated set does not crash
  * node.
  *
- * @tags: [requires_persistence]
+ * @tags: [requires_persistence, requires_majority_read_concern]
  */
 (function() {
     "use strict";
diff --git a/jstests/sharding/after_cluster_time.js b/jstests/sharding/after_cluster_time.js
index fea0a573bac..3c99680ebe8 100644
--- a/jstests/sharding/after_cluster_time.js
+++ b/jstests/sharding/after_cluster_time.js
@@ -1,5 +1,6 @@
 /**
  * Tests readConcern: afterClusterTime behavior in a sharded cluster.
+ * @tags: [requires_majority_read_concern]
  */
 (function() {
     "use strict";
diff --git a/jstests/sharding/change_stream_chunk_migration.js b/jstests/sharding/change_stream_chunk_migration.js
index e5eaa0460fc..4e40d75a6d7 100644
--- a/jstests/sharding/change_stream_chunk_migration.js
+++ b/jstests/sharding/change_stream_chunk_migration.js
@@ -1,5 +1,6 @@
 // Tests that change stream returns the stream of results continuously and in the right order when
 // it's migrating a chunk to a new shard.
+// @tags: [requires_majority_read_concern]
 (function() {
     'use strict';
 
diff --git a/jstests/sharding/change_stream_enforce_max_time_ms_on_mongos.js b/jstests/sharding/change_stream_enforce_max_time_ms_on_mongos.js
index bc22369bd8e..23295bf77cc 100644
--- a/jstests/sharding/change_stream_enforce_max_time_ms_on_mongos.js
+++ b/jstests/sharding/change_stream_enforce_max_time_ms_on_mongos.js
@@ -3,6 +3,7 @@
 // so allows the shards to regularly report their advancing optimes in the absence of any new data,
 // which in turn allows the AsyncResultsMerger to return sorted results retrieved from the other
 // shards.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/change_stream_invalidation.js b/jstests/sharding/change_stream_invalidation.js
index f4904d5182e..6e5b9727787 100644
--- a/jstests/sharding/change_stream_invalidation.js
+++ b/jstests/sharding/change_stream_invalidation.js
@@ -1,4 +1,5 @@
 // Tests invalidation of change streams on sharded collections.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/change_stream_lookup_single_shard_cluster.js b/jstests/sharding/change_stream_lookup_single_shard_cluster.js
index 02766b7b592..78ba996b8fe 100644
--- a/jstests/sharding/change_stream_lookup_single_shard_cluster.js
+++ b/jstests/sharding/change_stream_lookup_single_shard_cluster.js
@@ -1,6 +1,7 @@
 // Tests that a $changeStream pipeline is split rather than forwarded even in the case where the
 // cluster only has a single shard, and that it can therefore successfully look up a document in a
 // sharded collection.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
@@ -46,4 +47,4 @@
     stream.close();
 
     st.stop();
-})();
\ No newline at end of file
+})();
diff --git a/jstests/sharding/change_stream_read_preference.js b/jstests/sharding/change_stream_read_preference.js
index 572ecf82424..d2e78869f3c 100644
--- a/jstests/sharding/change_stream_read_preference.js
+++ b/jstests/sharding/change_stream_read_preference.js
@@ -1,5 +1,6 @@
 // Tests that change streams and their update lookups obey the read preference specified by the
 // user.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/change_stream_update_lookup_collation.js b/jstests/sharding/change_stream_update_lookup_collation.js
index 707fe59708f..2e3c615e1c6 100644
--- a/jstests/sharding/change_stream_update_lookup_collation.js
+++ b/jstests/sharding/change_stream_update_lookup_collation.js
@@ -2,7 +2,7 @@
 // use the collection's default collation once it gets to the shards.
 //
 // Collation is only supported with the find command, not with op query.
-// @tags: [requires_find_command]
+// @tags: [requires_find_command, requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/change_stream_update_lookup_read_concern.js b/jstests/sharding/change_stream_update_lookup_read_concern.js
index ec64b9a2842..2525b48299e 100644
--- a/jstests/sharding/change_stream_update_lookup_read_concern.js
+++ b/jstests/sharding/change_stream_update_lookup_read_concern.js
@@ -1,6 +1,7 @@
 // Tests that a change stream's update lookup will use the appropriate read concern. In particular,
 // tests that the update lookup will return a version of the document at least as recent as the
 // change that we're doing the lookup for, and that change will be majority-committed.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/change_streams.js b/jstests/sharding/change_streams.js
index 404b73c72ef..58d264d3ff6 100644
--- a/jstests/sharding/change_streams.js
+++ b/jstests/sharding/change_streams.js
@@ -1,4 +1,5 @@
 // Tests the behavior of change streams on sharded collections.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/change_streams_establishment_finds_new_shards.js b/jstests/sharding/change_streams_establishment_finds_new_shards.js
index e66e80ec6d4..c6e678e5d01 100644
--- a/jstests/sharding/change_streams_establishment_finds_new_shards.js
+++ b/jstests/sharding/change_streams_establishment_finds_new_shards.js
@@ -1,5 +1,6 @@
 // Tests that change streams is able to find and return results from new shards which are added
 // during cursor establishment.
+// @tags: [requires_majority_read_concern]
 (function() {
     'use strict';
 
diff --git a/jstests/sharding/change_streams_primary_shard_unaware.js b/jstests/sharding/change_streams_primary_shard_unaware.js
index 4c7329c85e3..203de19d88b 100644
--- a/jstests/sharding/change_streams_primary_shard_unaware.js
+++ b/jstests/sharding/change_streams_primary_shard_unaware.js
@@ -1,7 +1,7 @@
 // Tests the behavior of a change stream on a collection that becomes sharded, however the primary
 // shard is unaware and still sees the collection as unsharded.
 //
-// @tags: [requires_persistence]
+// @tags: [requires_persistence, requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/change_streams_shards_start_in_sync.js b/jstests/sharding/change_streams_shards_start_in_sync.js
index 3ed7d3fe98a..ea2e04169d0 100644
--- a/jstests/sharding/change_streams_shards_start_in_sync.js
+++ b/jstests/sharding/change_streams_shards_start_in_sync.js
@@ -5,6 +5,7 @@
 // could occur, followed by write 'B' to shard 1, and then the change stream could be established on
 // shard 1, then some third write 'C' could occur.  This test ensures that in that case, both 'A'
 // and 'B' will be seen in the changestream before 'C'.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/change_streams_unsharded_becomes_sharded.js b/jstests/sharding/change_streams_unsharded_becomes_sharded.js
index c59ae695486..74dd080592f 100644
--- a/jstests/sharding/change_streams_unsharded_becomes_sharded.js
+++ b/jstests/sharding/change_streams_unsharded_becomes_sharded.js
@@ -1,6 +1,7 @@
 // Tests the behavior of change streams on a collection that was initially unsharded but then
 // becomes sharded. In particular, test that post-shardCollection inserts update their cached
 // 'documentKey' to include the new shard key.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/lookup_change_stream_post_image_compound_shard_key.js b/jstests/sharding/lookup_change_stream_post_image_compound_shard_key.js
index 3c89fd6b85c..7ca746dfea3 100644
--- a/jstests/sharding/lookup_change_stream_post_image_compound_shard_key.js
+++ b/jstests/sharding/lookup_change_stream_post_image_compound_shard_key.js
@@ -1,5 +1,6 @@
 // Tests the behavior of looking up the post image for change streams on collections which are
 // sharded with a compound shard key.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/lookup_change_stream_post_image_hashed_shard_key.js b/jstests/sharding/lookup_change_stream_post_image_hashed_shard_key.js
index 613ca8f2b33..2be44c6ec3e 100644
--- a/jstests/sharding/lookup_change_stream_post_image_hashed_shard_key.js
+++ b/jstests/sharding/lookup_change_stream_post_image_hashed_shard_key.js
@@ -1,5 +1,6 @@
 // Tests the behavior of looking up the post image for change streams on collections which are
 // sharded with a hashed shard key.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/lookup_change_stream_post_image_id_shard_key.js b/jstests/sharding/lookup_change_stream_post_image_id_shard_key.js
index 0f16c4928a1..4243b6caac4 100644
--- a/jstests/sharding/lookup_change_stream_post_image_id_shard_key.js
+++ b/jstests/sharding/lookup_change_stream_post_image_id_shard_key.js
@@ -1,5 +1,6 @@
 // Tests the behavior of looking up the post image for change streams on collections which are
 // sharded with a key which is just the "_id" field.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/resume_change_stream.js b/jstests/sharding/resume_change_stream.js
index 41a2426796a..0e885550350 100644
--- a/jstests/sharding/resume_change_stream.js
+++ b/jstests/sharding/resume_change_stream.js
@@ -1,6 +1,6 @@
 // Tests resuming change streams on sharded collections.
 // We need to use a readConcern in this test, which requires read commands.
-// @tags: [requires_find_command]
+// @tags: [requires_find_command, requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/resume_change_stream_from_stale_mongos.js b/jstests/sharding/resume_change_stream_from_stale_mongos.js
index 68ec7799242..f75082623e8 100644
--- a/jstests/sharding/resume_change_stream_from_stale_mongos.js
+++ b/jstests/sharding/resume_change_stream_from_stale_mongos.js
@@ -1,6 +1,7 @@
 // Tests that resuming a change stream that has become sharded via a mongos that believes the
 // collection is still unsharded will end up targeting the change stream to all shards after getting
 // a stale shard version.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/resume_change_stream_on_subset_of_shards.js b/jstests/sharding/resume_change_stream_on_subset_of_shards.js
index b65690412e0..dc53c169dac 100644
--- a/jstests/sharding/resume_change_stream_on_subset_of_shards.js
+++ b/jstests/sharding/resume_change_stream_on_subset_of_shards.js
@@ -1,5 +1,6 @@
 // Designed to reproduce SERVER-32088, this tests that resuming a change stream on a sharded
 // collection where not all shards have a chunk in the collection will not work.
+// @tags: [requires_majority_read_concern]
 (function() {
     "use strict";