Revert "SERVER-41079 Add new build variant for the multiple oplog entries transaction format"

This reverts commit 6df77aa1579d11894a80ddd2edb3053db5abd0aa.

13 files changed, 10 insertions, 123 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index e15755f61d7..87c54e489df 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -389,7 +389,6 @@ variables:
   - enterprise-rhel-62-64-bit-inmem
   - enterprise-rhel-62-64-bit-flow-control-off
   - enterprise-rhel-62-64-bit-majority-read-concern-off
-  - enterprise-rhel-62-64-bit-multi-txn-oplog-entries
   - enterprise-rhel-62-64-bit-required-inmem
   - enterprise-rhel-62-64-bit-required-majority-read-concern-off
   - enterprise-rhel-67-s390x
@@ -10866,106 +10865,6 @@ buildvariants:
   - name: publish_packages
   - name: push
 
-- name: enterprise-rhel-62-64-bit-multi-txn-oplog-entries
-  display_name: "Enterprise RHEL 6.2 (Multiple oplog entries transaction format)"
-  modules:
-  - enterprise
-  run_on:
-  - rhel62-small
-  expansions:
-    compile_flags: >-
-      --ssl
-      MONGO_DISTMOD=rhel62
-      -j$(grep -c ^processor /proc/cpuinfo)
-      --release
-      --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
-    multiversion_platform: rhel62
-    multiversion_edition: enterprise
-    repo_edition: enterprise
-    scons_cache_scope: shared
-    tooltags: "ssl sasl gssapi"
-    build_mongoreplay: true
-    large_distro_name: rhel62-large
-    test_flags: >-
-        --mongodSetParameters="{useMultipleOplogEntryFormatForTransactions: true, maxNumberOfTransactionOperationsInSingleOplogEntry: 2}"
-        --excludeWithAnyTags=exclude_from_large_txns,exclude_from_large_txns_due_to_stmtids,exclude_from_large_txns_due_to_change_streams,exclude_from_large_txns_due_to_fast_count 
-  tasks:
-  - name: compile_TG
-    distros:
-    - rhel62-large
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: change_streams
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: concurrency_replication
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn
-  - name: concurrency_sharded_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns_and_balancer
-  - name: jsCore
-  - name: jsCore_txns
-  - name: logical_session_cache_replication_100ms_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_replication_default_refresh_jscore_passthrough_gen
-  - name: multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough_gen
-  - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
-  - name: multiversion_auth
-  - name: multiversion
-  - name: noPassthrough_gen
-  - name: replica_sets
-    distros:
-    - rhel62-large
-  - name: replica_sets_auth_gen
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_jscore_passthrough
-  - name: replica_sets_initsync_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_initsync_static_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_kill_secondaries_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_stmt_txn_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharded_multi_stmt_txn_jscore_passthrough
-    distros:
-    - rhel62-large
-
 - name: enterprise-rhel-62-64-bit-majority-read-concern-off
   display_name: "Enterprise RHEL 6.2 (majority read concern off)"
   modules:
@@ -14075,7 +13974,6 @@ buildvariants:
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
   - name: jsCore_txns
-  - name: jsCore_txns_multi_oplog_entries
   - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
   - name: logical_session_cache_replication_100ms_refresh_jscore_passthrough_gen
@@ -14110,8 +14008,6 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
   - name: replica_sets_initsync_jscore_passthrough
   - name: replica_sets_initsync_static_jscore_passthrough
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
   - name: replica_sets_multi_stmt_txn_jscore_passthrough
   - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
   - name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
@@ -14297,7 +14193,6 @@ buildvariants:
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
   - name: jsCore_txns
-  - name: jsCore_txns_multi_oplog_entries
   - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
   - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
@@ -14323,8 +14218,6 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
   - name: replica_sets_initsync_jscore_passthrough
   - name: replica_sets_initsync_static_jscore_passthrough
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
   - name: replica_sets_multi_stmt_txn_jscore_passthrough
   - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
   - name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
@@ -14470,7 +14363,6 @@ buildvariants:
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
   - name: jsCore_txns
-  - name: jsCore_txns_multi_oplog_entries
   - name: causally_consistent_jscore_txns_passthrough
   - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
@@ -14495,7 +14387,6 @@ buildvariants:
   - name: replica_sets_initsync_static_jscore_passthrough
   - name: replica_sets_kill_secondaries_jscore_passthrough
   - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
   - name: sasl
   - name: sharded_causally_consistent_jscore_txns_passthrough_gen
   - name: sharded_collections_causally_consistent_jscore_txns_passthrough
diff --git a/jstests/change_streams/report_post_batch_resume_token.js b/jstests/change_streams/report_post_batch_resume_token.js
index 75cfc927f6d..1055288a9f5 100644
--- a/jstests/change_streams/report_post_batch_resume_token.js
+++ b/jstests/change_streams/report_post_batch_resume_token.js
@@ -1,7 +1,7 @@
 /**
  * Tests that an aggregate with a $changeStream stage reports the latest postBatchResumeToken. This
  * test verifies postBatchResumeToken semantics that are common to sharded and unsharded streams.
- * @tags: [uses_transactions, exclude_from_large_txns_due_to_change_streams]
+ * @tags: [uses_transactions]
  */
 (function() {
     "use strict";
diff --git a/jstests/core/txns/await_prepared_transactions_on_FCV_downgrade.js b/jstests/core/txns/await_prepared_transactions_on_FCV_downgrade.js
index 47f90aab4dd..a6623101196 100644
--- a/jstests/core/txns/await_prepared_transactions_on_FCV_downgrade.js
+++ b/jstests/core/txns/await_prepared_transactions_on_FCV_downgrade.js
@@ -1,6 +1,6 @@
 /**
  * Test that we wait for prepared transactions to finish during downgrade to FCV 4.0.
- * @tags: [uses_transactions, uses_prepare_transaction, exclude_from_large_txns_due_to_stmtids]
+ * @tags: [uses_transactions, uses_prepare_transaction]
  */
 (function() {
     "use strict";
diff --git a/jstests/multiVersion/change_streams_resume_token_version.js b/jstests/multiVersion/change_streams_resume_token_version.js
index 09135a5e060..25575683248 100644
--- a/jstests/multiVersion/change_streams_resume_token_version.js
+++ b/jstests/multiVersion/change_streams_resume_token_version.js
@@ -1,7 +1,6 @@
 // Tests that a resume token from FCV 4.0 cannot be used with the new 'startAfter' option, because
 // the old version of the resume token doesn't contain enough information to distinguish an
 // invalidate event from the event which generated the invalidate.
-// @tags: [exclude_from_large_txns_due_to_change_streams]
 (function() {
     "use strict";
 
diff --git a/jstests/noPassthrough/change_stream_transaction.js b/jstests/noPassthrough/change_stream_transaction.js
index 790eb7c3756..8e41ccc3f6c 100644
--- a/jstests/noPassthrough/change_stream_transaction.js
+++ b/jstests/noPassthrough/change_stream_transaction.js
@@ -1,6 +1,5 @@
 // Confirms that change streams only see committed operations for prepared transactions.
-// @tags: [uses_transactions,uses_change_streams,requires_majority_read_concern,
-// exclude_from_large_txns_due_to_change_streams]
+// @tags: [uses_transactions,uses_change_streams,requires_majority_read_concern]
 (function() {
     "use strict";
 
diff --git a/jstests/noPassthrough/change_streams_resume_token_applyops_overlap.js b/jstests/noPassthrough/change_streams_resume_token_applyops_overlap.js
index e9f79bc3c05..3dc85cbde0b 100644
--- a/jstests/noPassthrough/change_streams_resume_token_applyops_overlap.js
+++ b/jstests/noPassthrough/change_streams_resume_token_applyops_overlap.js
@@ -2,8 +2,7 @@
  * Confirms that resuming from an event which has the same clusterTime as a transaction on another
  * shard does not cause the resume attempt to be prematurely rejected. Reproduction script for the
  * bug described in SERVER-40094.
- * @tags: [requires_sharding, uses_multi_shard_transaction, uses_transactions,
- * exclude_from_large_txns]
+ * @tags: [requires_sharding, uses_multi_shard_transaction, uses_transactions]
  */
 (function() {
     "use strict";
diff --git a/jstests/noPassthrough/report_post_batch_resume_token_mongod.js b/jstests/noPassthrough/report_post_batch_resume_token_mongod.js
index 0b5d23eb0bb..cf7dd55b1d0 100644
--- a/jstests/noPassthrough/report_post_batch_resume_token_mongod.js
+++ b/jstests/noPassthrough/report_post_batch_resume_token_mongod.js
@@ -1,6 +1,6 @@
 /**
  * Tests mongoD-specific semantics of postBatchResumeToken for $changeStream aggregations.
- * @tags: [uses_transactions, exclude_from_large_txns_due_to_change_streams]
+ * @tags: [uses_transactions]
  */
 (function() {
     "use strict";
diff --git a/jstests/noPassthrough/server_transaction_metrics_for_prepared_transactions.js b/jstests/noPassthrough/server_transaction_metrics_for_prepared_transactions.js
index 35818e94b0d..74a3f0a347e 100644
--- a/jstests/noPassthrough/server_transaction_metrics_for_prepared_transactions.js
+++ b/jstests/noPassthrough/server_transaction_metrics_for_prepared_transactions.js
@@ -1,6 +1,6 @@
 /**
  * Tests prepared transactions metrics in the serverStatus output.
- * @tags: [uses_transactions, uses_prepare_transaction, exclude_from_large_txns]
+ * @tags: [uses_transactions, uses_prepare_transaction]
  */
 (function() {
     "use strict";
diff --git a/jstests/replsets/abort_in_progress_transactions_on_step_up.js b/jstests/replsets/abort_in_progress_transactions_on_step_up.js
index 390478e1863..3e786b49981 100644
--- a/jstests/replsets/abort_in_progress_transactions_on_step_up.js
+++ b/jstests/replsets/abort_in_progress_transactions_on_step_up.js
@@ -1,7 +1,7 @@
 /**
  * Tests primary aborts in-progress transactions on stepup.
  *
- * @tags: [uses_transactions, exclude_from_large_txns]
+ * @tags: [uses_transactions]
  */
 (function() {
     "use strict";
diff --git a/jstests/replsets/recover_prepared_transaction_state.js b/jstests/replsets/recover_prepared_transaction_state.js
index a190892de46..41416518b85 100644
--- a/jstests/replsets/recover_prepared_transaction_state.js
+++ b/jstests/replsets/recover_prepared_transaction_state.js
@@ -12,7 +12,7 @@
  * After a rollback of commit/abort, we should correctly reconstruct the two prepared transactions
  * and be able to commit/abort them again.
  *
- * @tags: [uses_transactions, uses_prepare_transaction, exclude_from_large_txns_due_to_fast_count]
+ * @tags: [uses_transactions, uses_prepare_transaction]
  */
 (function() {
     "use strict";
diff --git a/jstests/replsets/rollback_aborted_prepared_transaction.js b/jstests/replsets/rollback_aborted_prepared_transaction.js
index b6965e45012..8c47034901a 100644
--- a/jstests/replsets/rollback_aborted_prepared_transaction.js
+++ b/jstests/replsets/rollback_aborted_prepared_transaction.js
@@ -5,7 +5,7 @@
  * by the transaction coordinator because transaction coordinator should always call
  * prepareTransaction with {w : "majority"}.
  *
- * @tags: [uses_transactions, uses_prepare_transaction, exclude_from_large_txns_due_to_fast_count]
+ * @tags: [uses_transactions, uses_prepare_transaction]
  */
 (function() {
     "use strict";
diff --git a/jstests/replsets/rollback_prepare_transaction.js b/jstests/replsets/rollback_prepare_transaction.js
index 59408d9ca10..dfd982bf28f 100644
--- a/jstests/replsets/rollback_prepare_transaction.js
+++ b/jstests/replsets/rollback_prepare_transaction.js
@@ -1,7 +1,7 @@
 /**
  * Tests that a prepared transactions are correctly rolled-back.
  *
- * @tags: [uses_transactions, uses_prepare_transaction, exclude_from_large_txns_due_to_fast_count]
+ * @tags: [uses_transactions, uses_prepare_transaction]
  */
 (function() {
     "use strict";
diff --git a/jstests/sharding/change_stream_transaction_sharded.js b/jstests/sharding/change_stream_transaction_sharded.js
index cdc7b0006be..8d7349e653d 100644
--- a/jstests/sharding/change_stream_transaction_sharded.js
+++ b/jstests/sharding/change_stream_transaction_sharded.js
@@ -4,7 +4,6 @@
 //   uses_change_streams,
 //   uses_multi_shard_transaction,
 //   uses_transactions,
-//   exclude_from_large_txns_due_to_change_streams,
 // ]
 (function() {
     "use strict";