SERVER-70344 aggregate several replica sets suites

16 files changed, 142 insertions, 81 deletions

diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese.yml
new file mode 100644
index 00000000000..b0f7386b6c5
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese.yml
@@ -0,0 +1,7 @@
+- suite_name: replica_sets_ese
+  base_suite: replica_sets
+  overrides:
+    - "encryption.testdata_ese"
+  excludes:
+    - "encryption.excluded_files"
+    - "encryption.serverless_excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese_gcm.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese_gcm.yml
new file mode 100644
index 00000000000..78a7c6c6b57
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese_gcm.yml
@@ -0,0 +1,8 @@
+- suite_name: replica_sets_ese_gcm
+  base_suite: replica_sets
+  overrides:
+    - "encryption.testdata_ese"
+    - "encryption.testdata_gcm"
+  excludes:
+    - "encryption.excluded_files"
+    - "encryption.serverless_excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_large_txns_format.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_large_txns_format.yml
new file mode 100644
index 00000000000..d63bdc5afa5
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_large_txns_format.yml
@@ -0,0 +1,9 @@
+- suite_name: replica_sets_large_txns_format
+  base_suite: replica_sets
+  overrides:
+    - "large_txns_format.enable"
+    - "archive.tests"
+    - "replica_sets.non_enterprise_root"
+  excludes:
+    - "large_txns_format.excluded_files"
+    - "large_txns_format.replica_sets_excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring.yml
new file mode 100644
index 00000000000..40177c7a2d4
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring.yml
@@ -0,0 +1,5 @@
+- suite_name: replica_sets_max_mirroring
+  base_suite: replica_sets
+  overrides:
+    - "max_mirroring.enable"
+    - "replica_sets.non_enterprise_root"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format.yml
new file mode 100644
index 00000000000..f25fa1f9e88
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format.yml
@@ -0,0 +1,14 @@
+- suite_name: replica_sets_max_mirroring_large_txns_format
+  base_suite: replica_sets
+  description: >-
+    This suite is a combination of replica_sets_max_mirroring and
+    replica_sets_large_txns_format. You can run any of these tests individually to
+    debug any issues that might arrise.
+  overrides:
+    - "max_mirroring.enable"
+    - "large_txns_format.enable"
+    - "archive.tests"
+    - "replica_sets.non_enterprise_root"
+  excludes:
+    - "large_txns_format.excluded_files"
+    - "large_txns_format.replica_sets_excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese.yml
new file mode 100644
index 00000000000..ab9c27cf3bd
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese.yml
@@ -0,0 +1,16 @@
+- suite_name: replica_sets_max_mirroring_large_txns_format_ese
+  base_suite: replica_sets
+  description: >-
+    This suite is a combination of replica_sets_max_mirroring, replica_sets_ese, and
+    replica_sets_large_txns_format. You can run any of these tests individually to
+    debug any issues that might arrise.
+  overrides:
+    - "max_mirroring.enable"
+    - "large_txns_format.enable"
+    - "encryption.testdata_ese"
+    - "archive.tests"
+  excludes:
+    - "encryption.excluded_files"
+    - "encryption.serverless_excluded_files"
+    - "large_txns_format.excluded_files"
+    - "large_txns_format.replica_sets_excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese_gcm.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese_gcm.yml
new file mode 100644
index 00000000000..9f837d248fb
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese_gcm.yml
@@ -0,0 +1,17 @@
+- suite_name: replica_sets_max_mirroring_large_txns_format_ese_gcm
+  base_suite: replica_sets
+  description: >-
+    This suite is a combination of replica_sets_max_mirroring, replica_sets_ese_gcm, and
+    replica_sets_large_txns_format. You can run any of these tests individually to
+    debug any issues that might arrise.
+  overrides:
+    - "max_mirroring.enable"
+    - "large_txns_format.enable"
+    - "encryption.testdata_ese"
+    - "encryption.testdata_gcm"
+    - "archive.tests"
+  excludes:
+    - "encryption.excluded_files"
+    - "encryption.serverless_excluded_files"
+    - "large_txns_format.excluded_files"
+    - "large_txns_format.replica_sets_excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/archive.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/archive.yml
new file mode 100644
index 00000000000..7609fb306a9
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/archive.yml
@@ -0,0 +1,5 @@
+- name: tests
+  value:
+    executor:
+      archive:
+        tests: true
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/encryption.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/encryption.yml
index 9c1011c7513..da5a5d93582 100644
--- a/buildscripts/resmokeconfig/matrix_suites/overrides/encryption.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/encryption.yml
@@ -1,4 +1,23 @@
 ### Overrides for some suites with encryption ###
+- name: testdata_ese
+  value:
+    executor:
+      config:
+        shell_options:
+          global_vars:
+            TestData:
+              enableEncryption: ''
+              encryptionKeyFile: 'src/mongo/db/modules/enterprise/jstests/encryptdb/libs/ekf2'
+
+- name: testdata_gcm
+  value:
+    executor:
+      config:
+        shell_options:
+          global_vars:
+            TestData:
+              encryptionCipherMode: 'AES256-GCM'
+
 - name: mongodfixture_ese
   value:
     executor:
@@ -18,3 +37,9 @@
   value:
     exclude_with_any_tags:
     - does_not_support_encrypted_storage_engine
+
+# Shard merge protocol won't work with encrypted storage engines.
+- name: serverless_excluded_files
+  value:
+    exclude_with_any_tags:
+    - serverless
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/large_txns_format.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/large_txns_format.yml
new file mode 100644
index 00000000000..f64a82ac4ba
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/large_txns_format.yml
@@ -0,0 +1,21 @@
+### Overrides for matrix suites that include large_txns_format ###
+- name: enable
+  value:
+    executor:
+      config:
+        shell_options:
+          global_vars:
+            TestData:
+              setParameters:
+                maxNumberOfTransactionOperationsInSingleOplogEntry: 1
+
+- name: excluded_files
+  value:
+    exclude_with_any_tags:
+    # Transactions are not allowed to operate on capped collections.
+    - requires_capped
+
+- name: replica_sets_excluded_files
+  value:
+    exclude_files:
+    - jstests/replsets/tenant_migration_recipient_shard_merge_copies_change_collections.js
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/max_mirroring.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/max_mirroring.yml
new file mode 100644
index 00000000000..a46fa12583e
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/max_mirroring.yml
@@ -0,0 +1,10 @@
+### Overrides for matrix suites that include max_mirroring ###
+- name: enable
+  value:
+    executor:
+      config:
+        shell_options:
+          global_vars:
+            TestData:
+              setParameters:
+                mirrorReads: "{samplingRate: 1.0}"
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets.yml
new file mode 100644
index 00000000000..89f42071aa5
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets.yml
@@ -0,0 +1,5 @@
+- name: non_enterprise_root
+  value:
+    selector:
+      roots:
+      - jstests/replsets/*.js
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_ese.yml b/buildscripts/resmokeconfig/suites/replica_sets_ese.yml
deleted file mode 100644
index cec83f33cc6..00000000000
--- a/buildscripts/resmokeconfig/suites/replica_sets_ese.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile src/mongo/db/modules/enterprise/jstests/encryptdb/libs/ekf2
-
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/replsets/*.js
-  - src/mongo/db/modules/enterprise/jstests/fcbis/*.js
-  exclude_with_any_tags:
-  - does_not_support_encrypted_storage_engine
-  # Shard merge protocol won't work with encrypted storage engines.
-  - serverless
-executor:
-  config:
-    shell_options:
-      nodb: ''
-      global_vars:
-        TestData:
-          enableEncryption: ''
-          encryptionKeyFile: *keyFile
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_ese_gcm.yml b/buildscripts/resmokeconfig/suites/replica_sets_ese_gcm.yml
deleted file mode 100644
index 5ad50811b58..00000000000
--- a/buildscripts/resmokeconfig/suites/replica_sets_ese_gcm.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile src/mongo/db/modules/enterprise/jstests/encryptdb/libs/ekf2
-
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/replsets/*.js
-  - src/mongo/db/modules/enterprise/jstests/fcbis/*.js
-  exclude_with_any_tags:
-  - does_not_support_encrypted_storage_engine
-  # Shard merge protocol won't work with encrypted storage engines.
-  - serverless
-executor:
-  config:
-    shell_options:
-      nodb: ''
-      global_vars:
-        TestData:
-          enableEncryption: ''
-          encryptionKeyFile: *keyFile
-          encryptionCipherMode: 'AES256-GCM'
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml b/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml
deleted file mode 100644
index adb47962994..00000000000
--- a/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/replsets/*.js
-  exclude_with_any_tags:
-  # Transactions are not allowed to operate on capped collections.
-  - requires_capped
-  exclude_files:
-  - jstests/replsets/tenant_migration_recipient_shard_merge_copies_change_collections.js
-
-executor:
-  archive:
-    tests: true
-  config:
-    shell_options:
-      nodb: ''
-      global_vars:
-        TestData:
-          setParameters:
-            maxNumberOfTransactionOperationsInSingleOplogEntry: 1
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_max_mirroring.yml b/buildscripts/resmokeconfig/suites/replica_sets_max_mirroring.yml
deleted file mode 100644
index a871411297b..00000000000
--- a/buildscripts/resmokeconfig/suites/replica_sets_max_mirroring.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/replsets/*.js
-  exclude_files:
-
-executor:
-  config:
-    shell_options:
-      nodb: ''
-      global_vars:
-        TestData:
-          setParameters:
-            mirrorReads: "{samplingRate: 1.0}"