SERVER-37343 Enable single shard transactions tests on 'majority read concern off' variant

5 files changed, 15 insertions, 9 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 904726a0f4a..30f411d1267 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -12018,9 +12018,12 @@ buildvariants:
   run_on:
   - rhel62-small
   expansions: &enterprise-rhel-62-64-bit-majority-read-concern-off-expansions
+  # Ban tests that run prepareTransaction or multi-shard transactions (which use
+  # prepareTransaction). prepareTransaction is rejected on nodes with
+  # enableMajorityReadConcern:"false" (SERVER-37559).
     test_flags: >-
       --majorityReadConcern=off
-      --excludeWithAnyTags=requires_majority_read_concern,uses_change_streams,uses_prepare_transaction,uses_multi_shard_transaction,uses_single_shard_transaction
+      --excludeWithAnyTags=requires_majority_read_concern,uses_change_streams,uses_prepare_transaction,uses_multi_shard_transaction
     compile_flags: >-
       -j$(grep -c ^processor /proc/cpuinfo)
       --ssl
@@ -12205,6 +12208,9 @@ buildvariants:
   - name: sasl
   - name: session_jscore_passthrough
   - name: sharded_collections_jscore_passthrough
+  - name: sharded_causally_consistent_jscore_txns_passthrough
+  - name: sharded_jscore_txns
+  - name: sharded_multi_stmt_txn_jscore_passthrough
   - name: sharding_0
     distros:
     - rhel62-large
@@ -12555,10 +12561,10 @@ buildvariants:
   tasks:
   # This build variants exists specifically to test that newly added or modified JavaScript tests
   # are correctly tagged with "requires_majority_read_concern", "uses_change_streams",
-  # "uses_prepare_transaction", "uses_multi_shard_transaction", and "uses_single_shard_transaction"
-  # prior to the changes being pushed. It uses the task list from the
-  # enterprise-rhel-62-64-bit-majority-read-concern-off build variant to determine the resmoke.py
-  # YAML suite configurations to run the tests under. Do not add more tasks to this list.
+  # "uses_prepare_transaction", and "uses_multi_shard_transaction" prior to the changes being
+  # pushed. It uses the task list from the enterprise-rhel-62-64-bit-majority-read-concern-off
+  # build variant to determine the resmoke.py YAML suite configurations to run the tests under. Do
+  # not add more tasks to this list.
   - name: compile_TG
     requires:
     - name: burn_in_tests
diff --git a/jstests/noPassthrough/readConcern_snapshot_mongos.js b/jstests/noPassthrough/readConcern_snapshot_mongos.js
index a37a9ed597c..539857a8fff 100644
--- a/jstests/noPassthrough/readConcern_snapshot_mongos.js
+++ b/jstests/noPassthrough/readConcern_snapshot_mongos.js
@@ -1,5 +1,5 @@
 // Test parsing of readConcern level 'snapshot' on mongos.
-// @tags: [requires_replication,requires_sharding, uses_transactions, uses_single_shard_transaction]
+// @tags: [requires_replication,requires_sharding, uses_transactions]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/transactions_error_labels.js b/jstests/sharding/transactions_error_labels.js
index 5cc8a298561..d1869367d47 100644
--- a/jstests/sharding/transactions_error_labels.js
+++ b/jstests/sharding/transactions_error_labels.js
@@ -1,5 +1,5 @@
 // Test TransientTransactionErrors error label in mongos write commands.
-// @tags: [uses_transactions, uses_single_shard_transaction]
+// @tags: [uses_transactions]
 (function() {
     "use strict";
 
diff --git a/jstests/sharding/transactions_writes_not_retryable.js b/jstests/sharding/transactions_writes_not_retryable.js
index 87f569d092e..8ade44a5cba 100644
--- a/jstests/sharding/transactions_writes_not_retryable.js
+++ b/jstests/sharding/transactions_writes_not_retryable.js
@@ -1,7 +1,7 @@
 /**
  * Verify writes inside a transaction are not interpreted as retryable writes in a sharded cluster.
  *
- * @tags: [requires_sharding, uses_transactions, uses_single_shard_transaction]
+ * @tags: [requires_sharding, uses_transactions]
  */
 (function() {
     "use strict";
diff --git a/jstests/sharding/txn_writes_during_movechunk.js b/jstests/sharding/txn_writes_during_movechunk.js
index f57f80a34e5..ad51c101d75 100644
--- a/jstests/sharding/txn_writes_during_movechunk.js
+++ b/jstests/sharding/txn_writes_during_movechunk.js
@@ -1,4 +1,4 @@
-// @tags: [uses_transactions, uses_single_shard_transaction]
+// @tags: [uses_transactions]
 load('./jstests/libs/chunk_manipulation_util.js');
 
 (function() {