SERVER-93551: Rebalance file/task count for update fuzzers (#26152) (#26517)

The fuzzer currently tests 400 files in 20 tasks. This can timeout when
testing with 7.0 during multiversion tasks. This PR changes it to 400
files in 40 tasks, so that each task has half as many files and should
no longer time out.

Anything in this description will be included in the commit message.
Replace or delete this text before merging. Add links to testing in the
comments of the PR.

GitOrigin-RevId: eecc1ece8520103f7c99dd4466992745b2054632

.bazelrc

@@ -52,6 +52,18 @@ build:local --experimental_remote_cache_compression=false
 build:local --grpc_keepalive_time=0s
 build:local --legacy_important_outputs
 
+# Disable remote execution and caching for public releases
+--config=public-release
+build:public-release --remote_executor=
+build:public-release --remote_cache=
+build:public-release --bes_backend=
+build:public-release --bes_results_url=
+build:public-release --tls_client_certificate=
+build:public-release --tls_client_key=
+build:public-release --experimental_remote_cache_compression=false
+build:public-release --grpc_keepalive_time=0s
+build:public-release --legacy_important_outputs
+
 
 # try to import the bazelrc files if available
 try-import %workspace%/.bazelrc.local

.eslintrc.yml

@@ -17,6 +17,7 @@ rules:
   no-redeclare: 0
   no-constant-condition: 0
   no-loss-of-precision: 0
+  semi: 2
   no-restricted-syntax: [
     'error',
     {

README.md

@@ -1,6 +1,6 @@
 # ![Logo](docs/leaf.svg) MongoDB README
 
-Welcome to MongoDB!
+Welcome to MongoDB 7.3!
 
 ## Components
 
@@ -91,5 +91,6 @@ Welcome to MongoDB!
   October 16, 2018 are published under the AGPL. All versions released after
   October 16, 2018, including patch fixes for prior versions, are published
   under the [Server Side Public License (SSPL) v1](LICENSE-Community.txt).
-  See individual files for details.
+  See individual files for details which will specify the license applicable
+  to each file. Files subject to the SSPL will be noted in their headers.
 

README.third_party.md

@@ -52,7 +52,7 @@ a notice will be included in
 | [schemastore.org]          | Apache-2.0        | 6847cfc3a1        |                      |                                 |
 | [scons]                    | MIT               | 3.1.2             |                      |                                 |
 | [Snappy]                   | BSD-3-Clause      | 1.1.7             |          ✗           |                ✗                |
-| [timelib]                  | MIT               | 2022.04           |                      |                ✗                |
+| [timelib]                  | MIT               | 2022.10           |                      |                ✗                |
 | [TomCrypt]                 | Public Domain     | 1.18.2            |          ✗           |                ✗                |
 | [Unicode]                  | Unicode-DFS-2015  | 8.0.0             |          ✗           |                ✗                |
 | [libunwind]                | MIT               | 1.6.2 + changes   |                      |                ✗                |
@@ -62,6 +62,7 @@ a notice will be included in
 | [Zlib]                     | Zlib              | 1.3               |          ✗           |                ✗                |
 | [Zstandard]                | BSD-3-Clause      | 1.5.5             |          ✗           |                ✗                |
 
+
 [abseil-cpp]: https://github.com/abseil/abseil-cpp
 [ASIO]: https://github.com/chriskohlhoff/asio
 [benchmark]: https://github.com/google/benchmark

SConstruct

@@ -5102,10 +5102,9 @@ def doConfigure(myenv):
 
     if use_system_version_of_library("libunwind"):
         conf.FindSysLibDep("unwind", ["unwind"])
-
-    if use_libunwind:
         if not conf.FindSysLibDep("lzma", ["lzma"]):
-            myenv.ConfError("Cannot find system library 'lzma' required for use with libunwind")
+            myenv.ConfError(
+                "Cannot find system library 'lzma' required for use with system libunwind")
 
     if use_system_version_of_library("intel_decimal128"):
         conf.FindSysLibDep("intel_decimal128", ["bid"])
@@ -5995,6 +5994,18 @@ env.AddPackageNameAlias(
     name="mongodb-cryptd-debugsymbols",
 )
 
+env.AddPackageNameAlias(
+    component="benchmarks",
+    role="runtime",
+    name="benchmarks",
+)
+
+env.AddPackageNameAlias(
+    component="benchmarks",
+    role="debug",
+    name="benchmarks-debugsymbols",
+)
+
 env.AddPackageNameAlias(
     component="mh",
     role="runtime",
@@ -6021,6 +6032,13 @@ env.AutoInstall(
     AIB_COMPONENTS_EXTRA=['dist-test'],
 )
 
+env.AutoInstall(
+    ".",
+    "$BENCHMARK_LIST",
+    AIB_COMPONENT="benchmarks",
+    AIB_ROLE='runtime',
+)
+
 env['RPATH_ESCAPED_DOLLAR_ORIGIN'] = '\\$$$$ORIGIN'
 
 
@@ -6570,11 +6588,22 @@ env.FinalizeInstallDependencies()
 # Create a install-all-meta alias that excludes unittests. This is most useful in
 # static builds where the resource requirements of linking 100s of static unittest
 # binaries is prohibitive.
-candidate_nodes = set([
-    str(gchild) for gchild in env.Flatten(
-        [child.all_children() for child in env.Alias('install-all-meta')[0].all_children()])
-])
-names = [f'install-{env["AIB_META_COMPONENT"]}', 'install-tests', env["UNITTEST_ALIAS"]]
+candidate_nodes = set()
+for child in env.Alias('install-all-meta')[0].all_children():
+    candidate_nodes.add(child)
+    for gchild in child.all_children():
+        candidate_nodes.add(gchild)
+
+names = [
+    f'install-{env["AIB_META_COMPONENT"]}',
+    'install-tests',
+    env["UNITTEST_ALIAS"],
+    'install-first-quarter-unittests',
+    'install-second-quarter-unittests',
+    'install-third-quarter-unittests',
+    'install-fourth-quarter-unittests',
+]
+
 env.Alias('install-all-meta-but-not-unittests', [
     node for node in candidate_nodes if str(node) not in names
     and not str(node).startswith(tuple([prefix_name + '-' for prefix_name in names]))

buildscripts/burn_in_tests.py

@@ -41,7 +41,7 @@ EXTERNAL_LOGGERS = {
     "urllib3",
 }
 
-DEFAULT_VARIANT = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required"
+DEFAULT_VARIANT = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
 ENTERPRISE_MODULE_PATH = "src/mongo/db/modules/enterprise"
 DEFAULT_REPO_LOCATIONS = [".", f"./{ENTERPRISE_MODULE_PATH}"]
 REPEAT_SUITES = 2

buildscripts/evergreen_gen_build_metrics_tasks.py

@@ -183,7 +183,7 @@ def main():
     else:
         if platform.machine() == 'x86_64':
             variant = BuildVariant(
-                name="enterprise-rhel-80-64-bit-build-metrics",
+                name="enterprise-rhel-8-64-bit-build-metrics",
                 activate=True,
             )
             for link_model, tasks in tasks['linux_x86_64_tasks'].items():
@@ -191,7 +191,7 @@ def main():
                     create_task_group(f'linux_X86_64_{link_model}', tasks), ['rhel80-xlarge'])
         else:
             variant = BuildVariant(
-                name="enterprise-rhel-80-aarch64-build-metrics",
+                name="enterprise-rhel-8-aarch64-build-metrics",
                 activate=True,
             )
             for link_model, tasks in tasks['linux_arm64_tasks'].items():

buildscripts/evergreen_resmoke_job_count.py

@@ -30,11 +30,12 @@ SYS_PLATFORM = sys.platform
 
 # Apply factor for a task based on the build variant it is running on.
 VARIANT_TASK_FACTOR_OVERRIDES = {
-    "enterprise-rhel-80-64-bit": [{"task": r"logical_session_cache_replication.*", "factor": 0.75}],
-    "enterprise-rhel-80-64-bit-inmem": [
+    "enterprise-rhel-8-64-bit": [{"task": r"logical_session_cache_replication.*", "factor": 0.75}],
+    "enterprise-rhel-8-64-bit-inmem": [
         {"task": "secondary_reads_passthrough", "factor": 0.3},
         {"task": "multi_stmt_txn_jscore_passthrough_with_migration", "factor": 0.3},
-    ]
+    ],
+    "enterprise-suse12-64": [{"task": "replica_sets_auth", "factor": 0.5}],
 }
 
 TASKS_FACTORS = [{"task": r"replica_sets.*", "factor": 0.5}, {"task": r"sharding.*", "factor": 0.5}]

buildscripts/generate_version_expansions.py

@@ -61,8 +61,8 @@ def generate_version_expansions():
             raise ValueError("Unable to parse version from stdin and no version.json provided")
 
     if version_parts[0]:
-        expansions["suffix"] = "latest"
-        expansions["src_suffix"] = "latest"
+        expansions["suffix"] = "v7.3-latest"
+        expansions["src_suffix"] = "v7.3-latest"
         expansions["is_release"] = "false"
     else:
         expansions["suffix"] = version_line

buildscripts/idl/idl_check_compatibility.py

@@ -339,6 +339,39 @@ ALLOWED_NEW_COMPLEX_ACCESS_CHECKS = dict(
     complexChecksSupersetSomeAllowed={'checkTwo'})
 
 
+@dataclass
+class AllowedNewPrivilege:
+    """Represents a privilege check that should be ignored by the API compatibility checker."""
+
+    resource_pattern: str
+    action_type: List[str]
+    agg_stage: Optional[str] = None
+
+    @classmethod
+    def create_from(cls, privilege: syntax.Privilege):
+        return cls(privilege.resource_pattern, privilege.action_type, privilege.agg_stage)
+
+
+ALLOWED_NEW_ACCESS_CHECK_PRIVILEGES = dict(
+    # Do not add any command other than the aggregate command or any privilege that is not required
+    # only by an aggregation stage not present in previously released versions.
+    aggregate=[
+        # TODO SERVER-87193: Check if we can remove the line below after the next 7.0 patch release (7.0.7) is out.
+        # The feature using 'queryStatsReadTransformed' has been backported to v7.0 but is not present
+        # in the latest patch release. It is guarded by a feature flag so we are allowing this conflict here.
+        AllowedNewPrivilege("cluster", ["queryStatsReadTransformed"], "queryStats"),
+    ],
+
+    # This list is only used in unit-tests.
+    complexChecksSupersetAllowed=[
+        AllowedNewPrivilege("resourcePatternTwo", ["actionTypeTwo"]),
+        AllowedNewPrivilege("resourcePatternThree", ["actionTypeThree"]),
+    ],
+    complexCheckPrivilegesSupersetSomeAllowed=[
+        AllowedNewPrivilege("resourcePatternTwo", ["actionTypeTwo"])
+    ])
+
+
 class FieldCompatibility:
     """Information about a Field to check compatibility."""
 
@@ -1357,6 +1390,12 @@ def check_complex_checks(ctxt: IDLCompatibilityContext,
             if check in new_checks_normalized:
                 new_checks_normalized.remove(check)
 
+    if cmd_name in ALLOWED_NEW_ACCESS_CHECK_PRIVILEGES:
+        new_privileges = [
+            privilege for privilege in new_privileges if AllowedNewPrivilege.create_from(privilege)
+            not in ALLOWED_NEW_ACCESS_CHECK_PRIVILEGES[cmd_name]
+        ]
+
     if (len(new_checks_normalized) + len(new_privileges)) > (
             len(old_checks_normalized) + len(old_privileges)):
         ctxt.add_new_additional_complex_access_check_error(cmd_name, new_idl_file_path)

buildscripts/idl/tests/compatibility_test_fail/new/compatibility_test_fail_new.idl

@@ -2762,6 +2762,45 @@ commands:
                 - check: checkOne
                 - check: checkTwo
 
+    complexCheckPrivilegesSupersetNoneAllowed:
+        description: "new command fails when privileges in the access check are a superset of the old
+                      privileges and none of the additional privileges are explicitly allowed."
+        command_name: complexCheckPrivilegesSupersetNoneAllowed
+        namespace: ignored
+        cpp_name: complexCheckPrivilegesSupersetNoneAllowed
+        strict: true
+        api_version: "1"
+        reply_type: OkReply
+        access_check:
+            complex:
+                - privilege:
+                    resource_pattern: resourcePatternOne
+                    action_type: [actionTypeOne]
+                - privilege:
+                    resource_pattern: resourcePatternTwo
+                    action_type: [actionTypeTwo]
+
+    complexCheckPrivilegesSupersetSomeAllowed:
+        description: "new command fails when privileges in the access check are a superset of the old
+                      privileges and not all of the additional privileges are explicitly allowed."
+        command_name: complexCheckPrivilegesSupersetSomeAllowed
+        namespace: ignored
+        cpp_name: complexCheckPrivilegesSupersetSomeAllowed
+        strict: true
+        api_version: "1"
+        reply_type: OkReply
+        access_check:
+            complex:
+                - privilege:
+                    resource_pattern: resourcePatternOne
+                    action_type: [actionTypeOne]
+                - privilege:
+                    resource_pattern: resourcePatternTwo
+                    action_type: [actionTypeTwo]
+                - privilege:
+                    resource_pattern: resourcePatternThree
+                    action_type: [actionTypeThree]
+
     complexChecksSupersetNoneAllowed:
         description: "new command fails when the the complex checks are a superset of the old
                       checks and none of the additional checks are explicitly allowed."

buildscripts/idl/tests/compatibility_test_fail/old/compatibility_test_fail_old.idl

@@ -2810,6 +2810,36 @@ commands:
                 - check: checkOne
                 - check: checkTwo
 
+    complexCheckPrivilegesSupersetNoneAllowed:
+        description: "new command fails when privileges in the access check are a superset of the old
+                      privileges and none of the additional privileges are explicitly allowed."
+        command_name: complexCheckPrivilegesSupersetNoneAllowed
+        namespace: ignored
+        cpp_name: complexCheckPrivilegesSupersetNoneAllowed
+        strict: true
+        api_version: "1"
+        reply_type: OkReply
+        access_check:
+            complex:
+                - privilege:
+                    resource_pattern: resourcePatternOne
+                    action_type: [actionTypeOne]
+
+    complexCheckPrivilegesSupersetSomeAllowed:
+        description: "new command fails when privileges in the access check are a superset of the old
+                      privileges and not all of the additional privileges are explicitly allowed."
+        command_name: complexCheckPrivilegesSupersetSomeAllowed
+        namespace: ignored
+        cpp_name: complexCheckPrivilegesSupersetSomeAllowed
+        strict: true
+        api_version: "1"
+        reply_type: OkReply
+        access_check:
+            complex:
+                - privilege:
+                    resource_pattern: resourcePatternOne
+                    action_type: [actionTypeOne]
+
     complexChecksSupersetNoneAllowed:
         description: "new command fails when the the complex checks are a superset of the old
                       checks and none of the additional checks are explicitly allowed."

buildscripts/idl/tests/compatibility_test_pass/new/compatibility_test_pass_new.idl

@@ -1967,6 +1967,15 @@ commands:
                 - check: checkOne
                 - check: checkTwo
                 - check: checkThree
+                - privilege:
+                    resource_pattern: resourcePatternOne
+                    action_type: [actionTypeOne]
+                - privilege:
+                    resource_pattern: resourcePatternTwo
+                    action_type: [actionTypeTwo]
+                - privilege:
+                    resource_pattern: resourcePatternThree
+                    action_type: [actionTypeThree]
 
     addedAggStage:
         description: "new command passes when a agg stage is added"

buildscripts/idl/tests/compatibility_test_pass/old/compatibility_test_pass_old.idl

@@ -1914,6 +1914,9 @@ commands:
         access_check:
             complex:
                 - check: checkOne
+                - privilege:
+                    resource_pattern: resourcePatternOne
+                    action_type: [actionTypeOne]
 
     addedAggStage:
         description: "new command passes when a agg stage is added"

buildscripts/idl/tests/test_compatibility.py

@@ -1287,6 +1287,22 @@ class TestIDLCompatibilityChecker(unittest.TestCase):
                         idl_compatibility_errors.ERROR_ID_NEW_ADDITIONAL_COMPLEX_ACCESS_CHECK)
         self.assertRegex(str(complex_checks_not_subset_two_error), "complexChecksNotSubsetTwo")
 
+        complex_check_privileges_superset_none_allowed_error = error_collection.get_error_by_command_name(
+            "complexCheckPrivilegesSupersetNoneAllowed")
+        self.assertTrue(complex_check_privileges_superset_none_allowed_error.error_id ==
+                        idl_compatibility_errors.ERROR_ID_NEW_ADDITIONAL_COMPLEX_ACCESS_CHECK)
+        self.assertRegex(
+            str(complex_check_privileges_superset_none_allowed_error),
+            "complexCheckPrivilegesSupersetNoneAllowed")
+
+        complex_check_privileges_superset_some_allowed_error = error_collection.get_error_by_command_name(
+            "complexCheckPrivilegesSupersetSomeAllowed")
+        self.assertTrue(complex_check_privileges_superset_some_allowed_error.error_id ==
+                        idl_compatibility_errors.ERROR_ID_NEW_ADDITIONAL_COMPLEX_ACCESS_CHECK)
+        self.assertRegex(
+            str(complex_check_privileges_superset_some_allowed_error),
+            "complexCheckPrivilegesSupersetSomeAllowed")
+
         complex_checks_superset_none_allowed_error = error_collection.get_error_by_command_name(
             "complexChecksSupersetNoneAllowed")
         self.assertTrue(complex_checks_superset_none_allowed_error.error_id ==
@@ -1510,7 +1526,7 @@ class TestIDLCompatibilityChecker(unittest.TestCase):
         self.assertRegex(
             str(new_command_type_field_added_as_stable_error), "newStableTypeFieldAdded")
 
-        self.assertEqual(error_collection.count(), 213)
+        self.assertEqual(error_collection.count(), 215)
 
     def test_generic_argument_compatibility_pass(self):
         """Tests that compatible old and new generic_argument.idl files should pass."""

buildscripts/package_test.py

@@ -342,8 +342,18 @@ def get_tools_package(arch_name: str, os_name: str) -> Optional[str]:
     if arch_name == "aarch64" and not os_name.startswith("amazon") and not os_name.startswith(
             "rhel"):
         arch_name = "arm64"
+
+    # Tools packages are only published to the latest RHEL version supported on master, but
+    # the tools binaries are cross compatible with other RHEL versions
+    # (see https://jira.mongodb.org/browse/SERVER-92939)
+    def major_version_matches(download_name: str) -> bool:
+        if (os_name.startswith("rhel") and download_name.startswith("rhel")
+                and os_name[4] == download_name[4]):
+            return True
+        return download_name == os_name
+
     for download in current_tools_releases["versions"][0]["downloads"]:
-        if download["name"] == os_name and download["arch"] == arch_name:
+        if major_version_matches(download["name"]) and download["arch"] == arch_name:
             return download["package"]["url"]
     return None
 

buildscripts/package_test_internal.py

@@ -4,6 +4,7 @@
 # pylint: disable=redefined-outer-name,invalid-name,subprocess-run-check
 
 import grp
+import json
 import logging
 import os
 import pathlib
@@ -71,8 +72,9 @@ def download_extract_package(package: str) -> List[str]:
 def download_extract_all_packages(package_urls: List[str]) -> List[str]:
     all_packages = []  # type: List[str]
     for package_url in package_urls:
-        package_names = download_extract_package(package_url)
-        all_packages.extend(["./" + package_name for package_name in package_names])
+        if package_url:
+            package_names = download_extract_package(package_url)
+            all_packages.extend(["./" + package_name for package_name in package_names])
     return all_packages
 
 
@@ -354,10 +356,13 @@ def test_install_is_complete(test_args: TestArgs):
         raise RuntimeError("Required group `{}' is not in configured groups: {}".format(
             test_args['mongo_groupname'], mongo_user_groups))
 
-    if user_info.pw_dir != test_args['mongo_home_dir']:
-        raise RuntimeError(
-            "Configured home directory `{}' does not match required path `{}'".format(
-                user_info.pw_dir, test_args['mongo_home_dir']))
+    if test_args['package_manager'] in ('yum', 'zypper'):
+        # Only RPM-based distros create the home directory. Debian/Ubuntu
+        # distros use a non-existent directory in /home
+        if user_info.pw_dir != test_args['mongo_home_dir']:
+            raise RuntimeError(
+                "Configured home directory `{}' does not match required path `{}'".format(
+                    user_info.pw_dir, test_args['mongo_home_dir']))
 
     if user_info.pw_shell != test_args['mongo_user_shell']:
         raise RuntimeError("Configured user shell `{}' does not match required path `{}'".format(
@@ -414,6 +419,13 @@ def test_stop():
 
 
 def test_install_compass(test_args: TestArgs):
+
+    if test_args['arch'] != "x86_64" or test_args['os_name'] not in ["ubuntu", "almalinux"]:
+        logging.info(
+            "Not installing compass on unsupported platform, see the docs: https://www.mongodb.com/docs/compass/current/install/"
+        )
+        return
+
     logging.info("Installing Compass.")
 
     cmd = []  # type: List[str]
@@ -421,15 +433,7 @@ def test_install_compass(test_args: TestArgs):
         cmd += ["DEBIAN_FRONTEND=noninteractive"]
     cmd += ["install_compass"]
 
-    exec_result = run_and_log(" ".join(cmd), end_on_error=False)
-
-    # install-compass currently cannot use zypper to install packages. Ignore error code.
-    if test_args['package_manager'] == 'zypper' or exec_result.returncode not in [
-            0,  # success
-            3,  # unsupported arch (compass only supports x86_64)
-            6,  # unsupported linux version
-    ]:
-        raise RuntimeError("Failed to install compass")
+    run_and_log(" ".join(cmd))
 
 
 def test_uninstall(test_args: TestArgs):
@@ -489,6 +493,7 @@ else:
     sys.exit(1)
 
 test_args = get_test_args(package_manager, package_files)
+logging.info("Test Args:\n%s", json.dumps(test_args, sort_keys=True, indent=4))
 setup(test_args)
 install_fake_systemd(test_args)
 

buildscripts/resmokeconfig/fully_disabled_feature_flags.yml

@@ -15,3 +15,4 @@
 - featureFlagGRPC
 - featureFlagReplicaSetEndpoint
 - featureFlagClassicRuntimePlanningForSbe
+- featureFlagCreateCollectionInPreparedTransactions

buildscripts/resmokeconfig/loggers/evg.yml

@@ -0,0 +1,27 @@
+logging:
+  executor:
+    format: '[%(name)s] %(asctime)s %(message)s'
+    handlers:
+      - class: logging.StreamHandler
+  fixture:
+    format: '[%(name)s] %(message)s'
+    handlers:
+      - class: evergreen
+  tests:
+    format: '[%(name)s] %(message)s'
+    handlers:
+      - class: evergreen
+
+shorten_logger_name:
+  remove:
+    - MongoDFixture
+    - ReplicaSetFixture
+    - ShardedClusterFixture
+  replace:
+    primary: prim
+    secondary: sec
+    node: n
+    shard: s
+    configsvr: c
+    mongos: s
+    job: j

buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_jscore_passthrough.yml

@@ -68,7 +68,6 @@ selector:
   - jstests/core/json_schema/json_schema.js
   - jstests/core/**/mr_bigobject.js
   - jstests/core/**/not2.js
-  - jstests/core/**/notablescan.js
   - jstests/core/**/null_query_semantics.js
   - jstests/core/**/or1.js
   - jstests/core/**/or2.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/jstestfuzz_sharded_last_continuous_new_old_old_new.yml

@@ -42,6 +42,11 @@ executor:
     num_shards: 2
     old_bin_version: last_continuous
   hooks:
+  - class: CheckRoutingTableConsistency
+    shell_options:
+      global_vars:
+        TestData:
+          mayForgeReshardingTempCollections: true
   - class: FuzzerRestoreSettings
   - class: CheckReplDBHash
     shell_options:

buildscripts/resmokeconfig/matrix_suites/generated_suites/jstestfuzz_sharded_last_lts_new_old_old_new.yml

@@ -42,6 +42,11 @@ executor:
     num_shards: 2
     old_bin_version: last_lts
   hooks:
+  - class: CheckRoutingTableConsistency
+    shell_options:
+      global_vars:
+        TestData:
+          mayForgeReshardingTempCollections: true
   - class: FuzzerRestoreSettings
   - class: CheckReplDBHash
     shell_options:

buildscripts/resmokeconfig/matrix_suites/overrides/multiversion.yml

@@ -321,6 +321,11 @@
   value:
     executor:
       hooks:
+        - class: CheckRoutingTableConsistency
+          shell_options:
+            global_vars:
+              TestData:
+                mayForgeReshardingTempCollections: true
         - class: FuzzerRestoreSettings
         - class: CheckReplDBHash
           shell_options:

buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml

@@ -110,24 +110,24 @@ evergreen_buildvariants:
     platform: rhel70
     architecture: x86_64
 
-  - name: rhel80
+  - name: rhel8
     edition: targeted
-    platform: rhel80
+    platform: rhel8
     architecture: x86_64
 
-  - name: enterprise-rhel-80-64-bit
+  - name: enterprise-rhel-8-64-bit
     edition: enterprise
-    platform: rhel80
+    platform: rhel8
     architecture: x86_64
 
-  - name: rhel-82-arm64
+  - name: rhel8-arm64
     edition: targeted
-    platform: rhel82
+    platform: rhel8
     architecture: arm64
 
-  - name: enterprise-rhel-82-arm64
+  - name: enterprise-rhel8-arm64
     edition: enterprise
-    platform: rhel82
+    platform: rhel8
     architecture: arm64
 
   - name: enterprise-rhel-71-ppc64le

buildscripts/resmokeconfig/suites/concurrency_replication_for_export_import.yml

@@ -27,6 +27,11 @@ selector:
   - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
   - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_read_write_kill_sessions.js
 
+  # This suite has TestData.discoveryTopology: False so clusterOptions.replication.enabled doesn't
+  # get set true. analyze_shard_key.js calls cluster.awaitReplication() which has an
+  # isReplication() check. So it is expected to fail every time it gets run in this suite.
+  - jstests/concurrency/fsm_workloads/analyze_shard_key.js
+
   exclude_with_any_tags:
   # Workloads that use a write concern will fail since the workload only connects to the primary.
   - uses_write_concern

buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml

@@ -204,6 +204,9 @@ executor:
         queryAnalysisWriterIntervalSecs: 1
         defaultConfigCommandTimeoutMS: 90000
         skipDroppingHashedShardKeyIndex: true
+        # Delay orphan cleanup to get around SERVER-87673.
+        # Choose a setting lower than continuous stepdown interval to get around SERVER-90242.
+        orphanCleanupDelaySecs: 5
     num_rs_nodes_per_shard: 3
     num_shards: 2
     num_mongos: 2

buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml

@@ -200,6 +200,9 @@ executor:
         queryAnalysisWriterIntervalSecs: 1
         defaultConfigCommandTimeoutMS: 90000
         skipDroppingHashedShardKeyIndex: true
+        # Delay orphan cleanup to get around SERVER-87673.
+        # Choose a setting lower than continuous stepdown interval to get around SERVER-90242.
+        orphanCleanupDelaySecs: 5
     num_rs_nodes_per_shard: 3
     num_shards: 2
     num_mongos: 2

buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml

@@ -309,7 +309,6 @@ selector:
   - jstests/core/**/not1.js
   - jstests/core/**/not2.js
   - jstests/core/**/not3.js
-  - jstests/core/**/notablescan.js
   - jstests/core/**/null_query_semantics.js
   - jstests/core/**/null_query_semantics.js
   - jstests/core/**/objectfind.js

buildscripts/resmokeconfig/suites/cwrwc_passthrough.yml

@@ -6,8 +6,11 @@ test_kind: js_test
 
 selector:
   roots:
-  - jstests/core/**/*.js
-
+    - jstests/core/**/*.js
+  exclude_files:
+    # This test attempts to read from the "local.oplog.rs" collection, which may be missing entries
+    # if a write was performed on the primary of the replica set instead.
+    - jstests/core/query/awaitdata_getmore_cmd.js
   exclude_with_any_tags:
   - assumes_standalone_mongod
 

buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_replica_sets_jscore_passthrough.yml

@@ -97,6 +97,10 @@ selector:
   # of commands. If they profile the setFCV command, this could cause the test to fail.
   - jstests/core/administrative/profile/profile_sampling.js
   - jstests/core/administrative/profile/profile1.js
+  - jstests/aggregation/sources/lookup/profile_lookup.js
+
+  # SERVER-85456: this test uses benchRun which does not use runCommand and index creation can fail
+  - jstests/core/bench_test1.js
 
 executor:
   archive:

buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharded_collections_jscore_passthrough.yml

@@ -103,6 +103,12 @@ selector:
   - jstests/aggregation/sources/facet/facet_stats.js
   - jstests/aggregation/sources/unionWith/unionWith_query_stats.js
 
+  # Test runs an updateOne without shard key which will use an internal transaction
+  # that can be aborted by the fcv upgrade downgrade suite.
+  - jstests/core/command_let_variables_expressions.js
+  - jstests/core/index/hashed/hashed_index_with_arrays.js
+  - jstests/core/write/update/update_with_pipeline.js
+
   # Expected failure due to interfering collMod commands acquiring a lock that the test does not expect.
   - jstests/core/write/crud_ops_do_not_throw_locktimeout.js
 
@@ -145,6 +151,9 @@ selector:
   # setFCV operations. The exclusion can be removed once the linked ticket is fixed.
   - jstests/core/top.js
 
+  # SERVER-85456: this test uses benchRun which does not use runCommand and index creation can fail
+  - jstests/core/bench_test1.js
+
   exclude_with_any_tags:
   - assumes_standalone_mongod
   - assumes_against_mongod_not_mongos

buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharding_jscore_passthrough.yml

@@ -105,6 +105,9 @@ selector:
   # setFCV operations. The exclusion can be removed once the linked ticket is fixed.
   - jstests/core/top.js
 
+  # SERVER-85456: this test uses benchRun which does not use runCommand and index creation can fail
+  - jstests/core/bench_test1.js
+
   exclude_with_any_tags:
   - assumes_standalone_mongod
   - assumes_against_mongod_not_mongos

buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml

@@ -34,6 +34,10 @@ executor:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
   - class: CheckRoutingTableConsistency
+    shell_options:
+      global_vars:
+        TestData:
+          mayForgeReshardingTempCollections: true
   fixture:
     class: ShardedClusterFixture
     mongos_options:

buildscripts/resmokeconfig/suites/jstestfuzz_sharded_causal_consistency.yml

@@ -32,6 +32,10 @@ executor:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
   - class: CheckRoutingTableConsistency
+    shell_options:
+      global_vars:
+        TestData:
+          mayForgeReshardingTempCollections: true
   fixture:
     class: ShardedClusterFixture
     mongos_options:

buildscripts/resmokeconfig/suites/jstestfuzz_sharded_continuous_stepdown.yml

@@ -38,6 +38,10 @@ executor:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
   - class: CheckRoutingTableConsistency
+    shell_options:
+      global_vars:
+        TestData:
+          mayForgeReshardingTempCollections: true
   fixture:
     class: ShardedClusterFixture
     mongos_options:

buildscripts/resmokeconfig/suites/jstestfuzz_sharded_session.yml

@@ -29,6 +29,10 @@ executor:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
   - class: CheckRoutingTableConsistency
+    shell_options:
+      global_vars:
+        TestData:
+          mayForgeReshardingTempCollections: true
   fixture:
     class: ShardedClusterFixture
     mongos_options:

buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_jscore_passthrough.yml

@@ -39,7 +39,7 @@ selector:
   # collection.getPlanCache().* calls planCache* commands which are not allowed with security token.
   - jstests/core/**/cached_plan_trial_does_not_discard_work.js
   - jstests/core/**/collation_plan_cache.js
-  - jstests/core/**/explode_for_sort_plan_cache.js
+  - jstests/core/**/in_expression_plan_cache.js
   - jstests/core/**/index_filter_commands.js
   - jstests/core/**/index_filter_commands_invalidate_plan_cache_entries.js
   - jstests/core/**/introspect_hidden_index_plan_cache_entries.js

buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml

@@ -41,7 +41,6 @@ selector:
   - jstests/core/json_schema/json_schema.js
   - jstests/core/**/mr_bigobject.js
   - jstests/core/**/not2.js
-  - jstests/core/**/notablescan.js
   - jstests/core/**/null_query_semantics.js
   - jstests/core/**/or1.js
   - jstests/core/**/or2.js

buildscripts/resmokeconfig/suites/sasl.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - src/mongo/db/modules/*/jstests/sasl/*.js
+  exclude_files:
+  - src/mongo/db/modules/enterprise/jstests/sasl/sasl_plugins.js
 
 # sasl tests start their own mongod's.
 executor:

buildscripts/resmokeconfig/suites/sasl_windows_cyrussasl.yml

@@ -0,0 +1,11 @@
+test_kind: js_test
+
+selector:
+  roots:
+  - src/mongo/db/modules/*/jstests/sasl/sasl_plugins.js
+
+# sasl tests start their own mongod's.
+executor:
+  config:
+    shell_options:
+      nodb: ""

buildscripts/resmokeconfig/suites/shard_merge_causally_consistent_jscore_passthrough.yml

@@ -30,6 +30,12 @@ selector:
   - jstests/core/**/crud_api.js
   - jstests/core/**/batch_write_command_w0.js
 
+  # These tests insert an uncompressed time-series bucket. Even though the tests subsequently remove
+  # this bucket, it may end up not being removed on the donor. If this happens, collection
+  # validation will fail due to the uncompressed bucket.
+  - jstests/core/timeseries/timeseries_insert_mixed_schema_bucket.js
+  - jstests/core/timeseries/timeseries_update_mixed_schema_bucket.js
+
   exclude_with_any_tags:
   - assumes_standalone_mongod
   # These tests run getMore commands which are not supported in the tenant migration passthrough.

buildscripts/resmokeconfig/suites/shard_merge_jscore_passthrough.yml

@@ -17,7 +17,15 @@ selector:
   # Skip any tests that run with auth explicitly.
   - jstests/core/administrative/*[aA]uth*.js
 
+  # These tests insert an uncompressed time-series bucket. Even though the tests subsequently remove
+  # this bucket, it may end up not being removed on the donor. If this happens, collection
+  # validation will fail due to the uncompressed bucket.
+  - jstests/core/timeseries/timeseries_insert_mixed_schema_bucket.js
+  - jstests/core/timeseries/timeseries_update_mixed_schema_bucket.js
+
   exclude_with_any_tags:
+  - incompatible_with_shard_merge
+
   - assumes_standalone_mongod
   # These tests run getMore commands which are not supported in the tenant migration passthrough.
   - requires_getmore

buildscripts/resmokeconfig/suites/sharded_collections_txns_uninitialized_fcv_jscore_passthrough.yml

@@ -0,0 +1,83 @@
+test_kind: js_test
+selector:
+  roots:
+  - jstests/core/txns/**/*.js
+  exclude_files:
+  ### Tests that are excluded because of sharding and transactions (from sharded_jscore_txns_sharded_collections.yml)
+  # Profile can only be run against the admin database on mongos.
+  - jstests/core/txns/transactions_profiling.js
+  - jstests/core/txns/transactions_profiling_with_drops.js
+
+  # Implicitly creates a database through a collection rename, which does not work in a sharded
+  # cluster.
+  - jstests/core/txns/transactions_block_ddl.js
+
+  # transactionLifetimeLimitSeconds parameter is not available in mongos.
+  - jstests/core/txns/abort_expired_transaction.js
+  - jstests/core/txns/abort_transaction_thread_does_not_block_on_locks.js
+  - jstests/core/txns/kill_op_on_txn_expiry.js
+
+  # Uses hangAfterCollectionInserts failpoint not available on mongos.
+  - jstests/core/txns/speculative_snapshot_includes_all_writes.js
+
+  # View tests aren't expected to work when collections are implicitly sharded.
+  - jstests/core/txns/view_reads_in_transaction.js
+
+  # These workloads explicitly create collections inside multi-document transactions. These are
+  # non-idempotent operations, and the implicit collection sharding logic upon collection access
+  # results in premature collection creation, causing the workloads to fail.
+  - jstests/core/txns/create_collection.js
+  - jstests/core/txns/create_collection_parallel.js
+  - jstests/core/txns/create_indexes.js
+  - jstests/core/txns/create_indexes_parallel.js
+  - jstests/core/txns/commands_in_txns_read_concern.js
+
+  exclude_with_any_tags:
+  - assumes_against_mongod_not_mongos
+  # This passthrough implicitly shards the accessed collections. Do not run tests where collections
+  # can't be created on `getCollection` call.
+  - assumes_no_implicit_collection_creation_on_get_collection
+  # Tests tagged with the following will fail because they assume collections are not sharded.
+  - assumes_no_implicit_collection_creation_after_drop
+  - assumes_no_implicit_index_creation
+  - assumes_unsharded_collection
+  - cannot_create_unique_index_when_using_hashed_shard_key
+  # Transactions are not allowed to operate on capped collections.
+  - requires_capped
+  # Prepare is not a command on mongos.
+  - uses_prepare_transaction
+
+executor:
+  config:
+    shell_options:
+      eval: >-
+        globalThis.testingReplication = true;
+        await import('jstests/libs/override_methods/send_command_to_initial_sync_node.js');
+        await import("jstests/libs/override_methods/implicitly_shard_accessed_collections.js");
+  fixture:
+    class: ShardedClusterFixture
+    mongos_options:
+      set_parameters:
+        enableTestCommands: 1
+    mongod_options:
+      set_parameters:
+        enableTestCommands: 1
+        collectionClonerBatchSize: 10
+        initialSyncOplogFetcherBatchSize: 10
+    num_shards: 2
+    num_rs_nodes_per_shard: 2
+    shard_options:
+      start_initial_sync_node: True
+      initial_sync_uninitialized_fcv: True
+      # The ReplicaSetFixture automatically sets initial sync nodes as hidden,
+      # which causes a mismatch when the replica set is added to the sharded cluster
+      # through addShard, because the replica set's internal connection string does
+      # include the initial sync node, but the list of hosts in the replica set from
+      # running `hello`/`isMaster` does not include it. This parameter force-hides it
+      # from the connection string.
+      hide_initial_sync_node_from_conn_string: True
+    configsvr_options:
+      num_nodes: 2
+      start_initial_sync_node: True
+      initial_sync_uninitialized_fcv: True
+      hide_initial_sync_node_from_conn_string: True

buildscripts/resmokeconfig/suites/sharded_collections_uninitialized_fcv_jscore_passthrough.yml

@@ -6,6 +6,9 @@ selector:
   - jstests/fle2/**/*.js
   - src/mongo/db/modules/*/jstests/fle2/**/*.js
   exclude_files:
+  # These tests run in the sharded_collections_txns_uninitialized_fcv passthrough suite.
+  - jstests/core/txns/**/*.js
+
   ### Tests that are excluded because of initial sync (from replica_sets_initsync_jscore_passthrough.yml)
   # Tests that query the system.profile collection cannot run in this suite since an initial sync
   # may insert unexpected operations into the profile collection.
@@ -94,37 +97,10 @@ selector:
   - jstests/core/**/optimized_match_explain.js
   - jstests/core/**/sort_array.js
 
-  ### Tests that are excluded because of sharding and transactions (from sharded_jscore_txns_sharded_collections.yml)
-  # Profile can only be run against the admin database on mongos.
-  - jstests/core/txns/transactions_profiling.js
-  - jstests/core/txns/transactions_profiling_with_drops.js
-
-  # Implicitly creates a database through a collection rename, which does not work in a sharded
-  # cluster.
-  - jstests/core/txns/transactions_block_ddl.js
-
-  # transactionLifetimeLimitSeconds parameter is not available in mongos.
-  - jstests/core/txns/abort_expired_transaction.js
-  - jstests/core/txns/abort_transaction_thread_does_not_block_on_locks.js
-  - jstests/core/txns/kill_op_on_txn_expiry.js
-
-  # Uses hangAfterCollectionInserts failpoint not available on mongos.
-  - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-
-  # View tests aren't expected to work when collections are implicitly sharded.
-  - jstests/core/txns/view_reads_in_transaction.js
-
-  # These workloads explicitly create collections inside multi-document transactions. These are
-  # non-idempotent operations, and the implicit collection sharding logic upon collection access
-  # results in premature collection creation, causing the workloads to fail.
-  - jstests/core/txns/create_collection.js
-  - jstests/core/txns/create_collection_parallel.js
-  - jstests/core/txns/create_indexes.js
-  - jstests/core/txns/create_indexes_parallel.js
-  - jstests/core/txns/commands_in_txns_read_concern.js
-
   # Will fail all commands including those needed to forward command to initial sync node.
   - jstests/core/failcommand_failpoint.js
+  # Has asserts that depend on the use of fsyncLock which is skipped by this passthrough.
+  - jstests/core/ddl/killop_drop_collection.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod

buildscripts/resmokeconfig/suites/sharding_csrs_continuous_config_stepdown.yml

@@ -104,6 +104,7 @@ selector:
   - jstests/sharding/move_chunk_insert_with_write_retryability.js
   - jstests/sharding/move_chunk_remove_with_write_retryability.js
   - jstests/sharding/move_chunk_update_with_write_retryability.js
+  - jstests/sharding/multi_collection_transaction_placement_conflict_workaround.js  # sets a failpoint on the config primary
   - jstests/sharding/refine_collection_shard_key_atomic.js  # sets a failpoint on the config primary
   - jstests/sharding/restart_transactions.js
   - jstests/sharding/txn_two_phase_commit_commands_basic_requirements.js
@@ -251,6 +252,8 @@ selector:
 
   # Test runs command on a config shard and does not shutdown safely upon transitioning to a dedicated config server.
   - jstests/sharding/fsync_lock_unlock.js
+  - jstests/sharding/fsync_with_prepared_transaction.js
+  - jstests/sharding/fsync_lock_fails_with_in_progress_ddl_op.js
 
   # Expect the configureQueryAnalyzer command to execute without config server stepdown.
   - jstests/sharding/analyze_shard_key/configure_query_analyzer_persistence.js

buildscripts/resmokeconfig/suites/sharding_txns_uninitialized_fcv_jscore_passthrough.yml

@@ -0,0 +1,60 @@
+test_kind: js_test
+selector:
+  roots:
+  - jstests/core/txns/**/*.js
+  exclude_files:
+  # Profile can only be run against the admin database on mongos.
+  - jstests/core/txns/transactions_profiling.js
+  - jstests/core/txns/transactions_profiling_with_drops.js
+
+  # Implicitly creates a database through a collection rename, which does not work in a sharded
+  # cluster.
+  - jstests/core/txns/transactions_block_ddl.js
+
+  # transactionLifetimeLimitSeconds parameter is not available in mongos.
+  - jstests/core/txns/abort_expired_transaction.js
+  - jstests/core/txns/abort_transaction_thread_does_not_block_on_locks.js
+  - jstests/core/txns/kill_op_on_txn_expiry.js
+
+  # Uses hangAfterCollectionInserts failpoint not available on mongos.
+  - jstests/core/txns/speculative_snapshot_includes_all_writes.js
+
+  exclude_with_any_tags:
+  - assumes_against_mongod_not_mongos
+  # Transactions are not allowed to operate on capped collections.
+  - requires_capped
+  # Prepare is not a command on mongos.
+  - uses_prepare_transaction
+executor:
+  config:
+    shell_options:
+      eval: >-
+        globalThis.testingReplication = true;
+        await import('jstests/libs/override_methods/send_command_to_initial_sync_node.js');
+  fixture:
+    class: ShardedClusterFixture
+    mongos_options:
+      set_parameters:
+        enableTestCommands: 1
+    mongod_options:
+      set_parameters:
+        enableTestCommands: 1
+        collectionClonerBatchSize: 10
+        initialSyncOplogFetcherBatchSize: 10
+    num_shards: 1
+    num_rs_nodes_per_shard: 2
+    shard_options:
+      start_initial_sync_node: True
+      initial_sync_uninitialized_fcv: True
+      # The ReplicaSetFixture automatically sets initial sync nodes as hidden,
+      # which causes a mismatch when the replica set is added to the sharded cluster
+      # through addShard, because the replica set's internal connection string does
+      # include the initial sync node, but the list of hosts in the replica set from
+      # running `hello`/`isMaster` does not include it. This parameter force-hides it
+      # from the connection string.
+      hide_initial_sync_node_from_conn_string: True
+    configsvr_options:
+      num_nodes: 2
+      start_initial_sync_node: True
+      initial_sync_uninitialized_fcv: True
+      hide_initial_sync_node_from_conn_string: True

buildscripts/resmokeconfig/suites/sharding_uninitialized_fcv_jscore_passthrough.yml

@@ -6,6 +6,8 @@ selector:
   - jstests/fle2/**/*.js
   - src/mongo/db/modules/*/jstests/fle2/**/*.js
   exclude_files:
+  # These tests are run in sharded_txns_uninitialized_fcv_jscore_passthrough.
+  - jstests/core/txns/**/*.js
   ### Tests that are excluded because of initial sync (from replica_sets_initsync_jscore_passthrough.yml)
   # Tests that query the system.profile collection cannot run in this suite since an initial sync
   # may insert unexpected operations into the profile collection.
@@ -68,33 +70,14 @@ selector:
   # we expect a second drop to return status OK.
   - jstests/core/**/explain_upsert.js
 
-  ### Tests that are excluded because of sharding and transactions (from sharded_jscore_txns.yml)
-  # Profile can only be run against the admin database on mongos.
-  - jstests/core/txns/transactions_profiling.js
-  - jstests/core/txns/transactions_profiling_with_drops.js
-
-  # Implicitly creates a database through a collection rename, which does not work in a sharded
-  # cluster.
-  - jstests/core/txns/transactions_block_ddl.js
-
-  # transactionLifetimeLimitSeconds parameter is not available in mongos.
-  - jstests/core/txns/abort_expired_transaction.js
-  - jstests/core/txns/abort_transaction_thread_does_not_block_on_locks.js
-  - jstests/core/txns/kill_op_on_txn_expiry.js
-
-  # Uses hangAfterCollectionInserts failpoint not available on mongos.
-  - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-
   # Will fail all commands including those needed to forward command to initial sync node.
   - jstests/core/failcommand_failpoint.js
+  # Has asserts that depend on the use of fsyncLock which is skipped by this passthrough.
+  - jstests/core/ddl/killop_drop_collection.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
   - assumes_against_mongod_not_mongos
-  # Transactions are not allowed to operate on capped collections.
-  - requires_capped
-  # Prepare is not a command on mongos.
-  - uses_prepare_transaction
   # system.profile collection doesn't exist on mongos.
   - requires_profiling
 
@@ -115,7 +98,7 @@ executor:
         enableTestCommands: 1
         collectionClonerBatchSize: 10
         initialSyncOplogFetcherBatchSize: 10
-    num_shards: 2
+    num_shards: 1
     num_rs_nodes_per_shard: 2
     shard_options:
       start_initial_sync_node: True

buildscripts/resmokeconfig/suites/timeseries_crud_jscore_passthrough.yml

@@ -114,6 +114,7 @@ selector:
   - jstests/core/write/update/update_setOnInsert.js
   - jstests/core/write/update/upsert_fields.js
   - jstests/core/write/update/upsert_fields_duplicate_or.js
+  - jstests/core/write/update/upsert_nor.js
   - jstests/core/write/write_error_message_truncation.js
   - jstests/core/write/write_result.js
   # Time-series collections may generate different profiling entries from regular ones.
@@ -157,7 +158,9 @@ selector:
   - jstests/core/positional_projection.js # Positional projection
   - jstests/core/query/batch_size.js # singleBatch
   - jstests/core/query/dbref/dbref3.js # Positional projection
-  - jstests/core/query/explode_for_sort_plan_cache.js # Not first stage in pipeline
+  # Not first stage in pipeline. The following test uses $planCacheStats, which is required to be the
+  # first stage in a pipeline. This will be incomplatible with timeseries.
+  - jstests/core/query/in_expression_plan_cache.js
   - jstests/core/query/find/find_getmore_cmd.js # singleBatch
   - jstests/core/query/find/finda.js # returnKey
   - jstests/core/query/index_key_expression.js # Unclean aggregation result
@@ -180,6 +183,7 @@ selector:
   - jstests/core/testminmax.js # min
   # Different field ordering.
   - jstests/core/query/basica.js
+  - jstests/core/query/group_lookup_with_canonical_query_prefix.js
   - jstests/core/query/objid/objid3.js
   - jstests/core/query/or/or1.js
   - jstests/core/query/or/or2.js
@@ -202,7 +206,6 @@ selector:
   - jstests/core/query/type/type_array.js
   - jstests/core/write/update/update_numeric_field_name.js
   # Time-series collections have different indexes from regular collections.
-  - jstests/core/notablescan.js
   - jstests/core/query/array/arrayfind4.js
   - jstests/core/query/array/arrayfind9.js
   - jstests/core/query/array/arrayfinda.js
@@ -255,6 +258,9 @@ selector:
   - jstests/core/query/cursor/getmore_invalidated_cursors.js
   # TODO (SERVER-85205): Try to enable the test(s).
   - jstests/core/write/update/upsert_and.js
+  # For inserts on time-series collections, mongod does _not_ replace empty timestamp values
+  # with the current time.
+  - jstests/core/query/empty_ts.js
 
   exclude_with_any_tags:
   - requires_sharding

buildscripts/resmokeconfig/suites/unittests_first_quarter.yml

@@ -0,0 +1,7 @@
+test_kind: cpp_unit_test
+
+selector:
+  root: build/first_quarter_unittests.txt
+
+executor:
+  config: {}

buildscripts/resmokeconfig/suites/unittests_fourth_quarter.yml

@@ -0,0 +1,7 @@
+test_kind: cpp_unit_test
+
+selector:
+  root: build/fourth_quarter_unittests.txt
+
+executor:
+  config: {}

buildscripts/resmokeconfig/suites/unittests_second_quarter.yml

@@ -0,0 +1,7 @@
+test_kind: cpp_unit_test
+
+selector:
+  root: build/second_quarter_unittests.txt
+
+executor:
+  config: {}

buildscripts/resmokeconfig/suites/unittests_third_quarter.yml

@@ -0,0 +1,7 @@
+test_kind: cpp_unit_test
+
+selector:
+  root: build/third_quarter_unittests.txt
+
+executor:
+  config: {}

buildscripts/resmokelib/config.py

@@ -145,6 +145,7 @@ DEFAULTS = {
     "task_doc": None,
     "variant_name": None,
     "version_id": None,
+    "work_dir": None,
     "evg_project_config_path": "etc/evergreen.yml",
 
     # WiredTiger options.
@@ -382,6 +383,9 @@ EVERGREEN_VARIANT_NAME = None
 # the commit hash.
 EVERGREEN_VERSION_ID = None
 
+# The Evergreen task's working directory.
+EVERGREEN_WORK_DIR = None
+
 # Path to evergreen project configuration yaml file
 EVERGREEN_PROJECT_CONFIG_PATH = None
 
@@ -644,12 +648,16 @@ DEFAULT_UNIT_TEST_LIST = "build/unittests.txt"
 DEFAULT_INTEGRATION_TEST_LIST = "build/integration_tests.txt"
 DEFAULT_LIBFUZZER_TEST_LIST = "build/libfuzzer_tests.txt"
 DEFAULT_PRETTY_PRINTER_TEST_LIST = "build/pretty_printer_tests.txt"
-
+SPLIT_UNITTESTS_LISTS = [
+    f"build/{test_group}_quarter_unittests.txt"
+    for test_group in ['first', 'second', 'third', 'fourth']
+]
 # External files or executables, used as suite selectors, that are created during the build and
 # therefore might not be available when creating a test membership map.
 EXTERNAL_SUITE_SELECTORS = (DEFAULT_BENCHMARK_TEST_LIST, DEFAULT_UNIT_TEST_LIST,
                             DEFAULT_INTEGRATION_TEST_LIST, DEFAULT_DBTEST_EXECUTABLE,
-                            DEFAULT_LIBFUZZER_TEST_LIST, DEFAULT_PRETTY_PRINTER_TEST_LIST)
+                            DEFAULT_LIBFUZZER_TEST_LIST, DEFAULT_PRETTY_PRINTER_TEST_LIST,
+                            *SPLIT_UNITTESTS_LISTS)
 
 # Where to look for logging and suite configuration files
 CONFIG_DIR = None

buildscripts/resmokelib/configure_resmoke.py

@@ -484,6 +484,7 @@ or explicitly pass --installDir to the run subcommand of buildscripts/resmoke.py
     _config.EVERGREEN_TASK_DOC = config.pop("task_doc")
     _config.EVERGREEN_VARIANT_NAME = config.pop("variant_name")
     _config.EVERGREEN_VERSION_ID = config.pop("version_id")
+    _config.EVERGREEN_WORK_DIR = config.pop("work_dir")
     _config.EVERGREEN_PROJECT_CONFIG_PATH = config.pop("evg_project_config_path")
 
     # otel info
@@ -510,6 +511,8 @@ or explicitly pass --installDir to the run subcommand of buildscripts/resmoke.py
         )
         if not setup_success:
             print("Failed to create file to send otel metrics to. Continuing.")
+    except (KeyboardInterrupt, SystemExit):
+        raise
     except:
         # We want this as a catch all exception
         # If there is some problem setting up metrics we don't want resmoke to fail
@@ -730,4 +733,5 @@ def detect_evergreen_config(parsed_args: argparse.Namespace,
     parsed_args.task_name = expansions.get("task_name", None)
     parsed_args.variant_name = expansions.get("build_variant", None)
     parsed_args.version_id = expansions.get("version_id", None)
+    parsed_args.work_dir = expansions.get("workdir", None)
     parsed_args.evg_project_config_path = expansions.get("evergreen_config_file_path", None)

buildscripts/resmokelib/logging/buildlogger.py

@@ -14,6 +14,7 @@ CREATE_BUILD_ENDPOINT = "/build"
 APPEND_GLOBAL_LOGS_ENDPOINT = "/build/%(build_id)s"
 CREATE_TEST_ENDPOINT = "/build/%(build_id)s/test"
 APPEND_TEST_LOGS_ENDPOINT = "/build/%(build_id)s/test/%(test_id)s"
+PARSLEY_LOGS_URL = "https://parsley.mongodb.com/resmoke/%(build_id)s/test/%(test_id)s"
 
 _BUILDLOGGER_CONFIG = os.getenv("BUILDLOGGER_CREDENTIALS", "mci.buildlogger")
 
@@ -342,3 +343,8 @@ class BuildloggerServer(object):
         base_url = _config.BUILDLOGGER_URL.rstrip("/")
         endpoint = APPEND_TEST_LOGS_ENDPOINT % {"build_id": build_id, "test_id": test_id}
         return "%s/%s" % (base_url, endpoint.strip("/"))
+
+    @staticmethod
+    def get_parsley_log_url(build_id, test_id):
+        """Return the parsley log URL."""
+        return PARSLEY_LOGS_URL % {"build_id": build_id, "test_id": test_id}

buildscripts/resmokelib/logging/formatters.py

@@ -19,3 +19,16 @@ class TimestampFormatter(logging.Formatter):
 
         formatted_time = time.strftime("%H:%M:%S", converted_time)
         return "%s.%03dZ" % (formatted_time, record.msecs)
+
+
+class EvergreenLogFormatter(logging.Formatter):
+    """Log line formatter for Evergreen log messages.
+
+    See `https://docs.devprod.prod.corp.mongodb.com/evergreen/Project-Configuration/Task-Output-Directory#test-logs`
+    for more info.
+    """
+
+    def format(self, record):
+        ts = int(record.created * 1e9)
+
+        return "\n".join([f"{ts} {line}" for line in super().format(record).split("\n")])

buildscripts/resmokelib/logging/handlers.py

@@ -231,6 +231,29 @@ class BufferedHandler(logging.Handler):
         logging.Handler.close(self)
 
 
+class BufferedFileHandler(BufferedHandler):
+    """File handler with in-memory buffering."""
+
+    def __init__(self, filename, capacity=2000, interval_secs=600):
+        """Initialize the handler with the filename and buffer capacity and flush interval."""
+        super().__init__(capacity, interval_secs)
+        self.file = open(filename, "a")
+
+    def process_record(self, record):
+        """Return the formatted record message appended with a newline."""
+        return self.format(record) + "\n"
+
+    def _flush_buffer_with_lock(self, buf, close_called):
+        """Write the buffered log lines to the destination file."""
+        self.file.writelines(buf)
+
+    def close(self):
+        """Close the handler and the file descriptor."""
+        super().close()
+
+        self.file.close()
+
+
 class HTTPHandler(object):
     """A class which sends data to a web server using POST requests."""
 

buildscripts/resmokelib/logging/loggers.py

@@ -1,17 +1,19 @@
 """Module to hold the logger instances themselves."""
 
 import logging
+import os
 import re
 import shutil
 import subprocess
 import sys
+import yaml
 
 from buildscripts.resmokelib import config
 from buildscripts.resmokelib import errors
 from buildscripts.resmokelib.core import redirect as redirect_lib
 from buildscripts.resmokelib.logging import buildlogger
 from buildscripts.resmokelib.logging import formatters
-from buildscripts.resmokelib.logging.handlers import ExceptionExtractionHandler, ExceptionExtractor, Truncate
+from buildscripts.resmokelib.logging.handlers import BufferedFileHandler, ExceptionExtractionHandler, ExceptionExtractor, Truncate
 
 _DEFAULT_FORMAT = "[%(name)s] %(message)s"
 
@@ -95,6 +97,13 @@ def configure_loggers():
     global ROOT_EXECUTOR_LOGGER  # pylint: disable=global-statement
     ROOT_EXECUTOR_LOGGER = new_root_logger(EXECUTOR_LOGGER_NAME)
 
+    _write_evergreen_log_spec()
+
+
+def get_evergreen_log_name(job_num, test_id=None):
+    """Return the log name, relative to the reserved test log directory, on the Evergreen task host."""
+    return f"job{job_num}/" + (f"{test_id}.log" if test_id else "global.log")
+
 
 def new_root_logger(name):
     """
@@ -173,6 +182,7 @@ def new_fixture_logger(fixture_class, job_num):
     logger = FixtureLogger(_shorten(full_name), full_name, external_sut_hostname)
     logger.parent = ROOT_FIXTURE_LOGGER
     _add_build_logger_handler(logger, job_num)
+    _add_evergreen_handler(logger, job_num)
 
     _FIXTURE_LOGGER_REGISTRY[job_num] = logger
     return logger
@@ -225,6 +235,7 @@ def new_test_logger(test_shortname, test_basename, command, parent, job_num, tes
     name = "%s:%s" % (parent.name, test_shortname)
     logger = logging.Logger(name)
     logger.parent = parent
+    _add_evergreen_handler(logger, job_num, test_id)
 
     def _get_test_endpoint(job_num, test_basename, command, meta_logger):
         """Get a new test endpoint for the buildlogger server."""
@@ -242,7 +253,8 @@ def new_test_logger(test_shortname, test_basename, command, parent, job_num, tes
                     " test_id".format(test_basename))
 
             url = BUILDLOGGER_SERVER.get_test_log_url(build_id, test_id)
-            meta_logger.info("Writing output of %s to %s.", test_basename, url)
+            parsley_url = BUILDLOGGER_SERVER.get_parsley_log_url(build_id, test_id)
+            meta_logger.info("Writing output of %s to %s.", test_basename, parsley_url)
 
         return (test_id, url)
 
@@ -283,6 +295,8 @@ def _add_handler(logger, handler_info, formatter):
         handler = logging.StreamHandler(sys.stdout)
     elif handler_class == "buildlogger":
         return  # Buildlogger handlers are applied when creating specific child loggers
+    elif handler_class == "evergreen":
+        return  # Evergreen handlers are applied when creating specific child loggers
     else:
         raise ValueError("Unknown handler class '%s'" % handler_class)
     handler.setFormatter(formatter)
@@ -352,3 +366,55 @@ def _shorten(logger_name):
     logger_name = re.sub(r"(^[:_]+|[:_]+$)", "", logger_name)
 
     return logger_name
+
+
+# Utility functions for Evergreen file system logging.
+# See `https://docs.devprod.prod.corp.mongodb.com/evergreen/Project-Configuration/Task-Output-Directory#test-logs`
+# for more information.
+
+
+def _write_evergreen_log_spec():
+    """Configure file system logging for Evergreen tasks."""
+    if not config.EVERGREEN_WORK_DIR:
+        return
+
+    fp = f"{_get_evergreen_log_dirname()}/log_spec.yaml"
+    os.makedirs(os.path.dirname(fp), exist_ok=True)
+
+    ROOT_EXECUTOR_LOGGER.info("Writing Evergreen test log spec to %s.", fp)
+
+    log_spec = {
+        "version": 0,
+        "format": "text-timestamp",
+    }
+    with open(fp, "w") as f:
+        yaml.dump(log_spec, f)
+
+
+def _add_evergreen_handler(logger, job_num, test_id=None):
+    """Add a new evergreen handler to a logger."""
+    logger_info = config.LOGGING_CONFIG[TESTS_LOGGER_NAME]
+    evergreen_handler_info = None
+    for handler_info in logger_info["handlers"]:
+        if handler_info["class"] == "evergreen":
+            evergreen_handler_info = handler_info
+            break
+
+    if evergreen_handler_info:
+        fp = f"{_get_evergreen_log_dirname()}/{get_evergreen_log_name(job_num, test_id)}"
+        os.makedirs(os.path.dirname(fp), exist_ok=True)
+
+        handler = BufferedFileHandler(fp)
+        handler.setFormatter(
+            formatters.EvergreenLogFormatter(fmt=logger_info.get("format", _DEFAULT_FORMAT)))
+        logger.addHandler(handler)
+
+        if test_id:
+            ROOT_EXECUTOR_LOGGER.info("Writing output of %s to %s.", test_id, fp)
+        else:
+            ROOT_EXECUTOR_LOGGER.info("Writing output of job #%d to %s.", job_num, fp)
+
+
+def _get_evergreen_log_dirname():
+    """Return the reserved directory for test logs on the Evergreen task host."""
+    return f"{config.EVERGREEN_WORK_DIR}/build/TestLogs"

buildscripts/resmokelib/mongo_fuzzer_configs.py

@@ -147,17 +147,6 @@ def generate_mongod_parameters(rng, mode):
     ret["wiredTigerConcurrentReadTransactions"] = rng.randint(5, 32)
     ret["wiredTigerStressConfig"] = False if mode != 'stress' else rng.choice([True, False])
 
-    ret["oplogFetcherUsesExhaust"] = rng.choice([True, False])
-    ret["replWriterThreadCount"] = rng.randint(1, 256)
-    ret["replBatchLimitOperations"] = rng.randint(1, 1000 * 1000)
-    ret["replBatchLimitBytes"] = rng.randint(16 * 1024 * 1024, 100 * 1024 * 1024)
-    # For `initialSyncSourceReadPreference`, the option `secondary` is excluded from the fuzzer
-    # because the generated mongod parameters are used for every node in the replica set, so the
-    # secondaries in the replica set will not be able to find a valid sync source.
-    ret["initialSyncSourceReadPreference"] = rng.choice(
-        ["nearest", "primary", "primaryPreferred", "secondaryPreferred"])
-    ret["initialSyncMethod"] = rng.choice(["fileCopyBased", "logical"])
-
     # We need a higher timeout to account for test slowness
     ret["receiveChunkWaitForRangeDeleterTimeoutMS"] = 300000
     ret["defaultConfigCommandTimeoutMS"] = 90000

buildscripts/resmokelib/multiversion/__init__.py

@@ -95,7 +95,8 @@ class MultiversionPlugin(PluginInterface):
         :param kwargs: additional args.
         :return: None or a Subcommand.
         """
-        configure_resmoke.validate_and_update_config(parser, parsed_args)
         if subcommand == MULTIVERSION_SUBCOMMAND:
+            configure_resmoke.detect_evergreen_config(parsed_args)
+            configure_resmoke.validate_and_update_config(parser, parsed_args)
             return MultiversionConfigSubcommand(parsed_args)
         return None

buildscripts/resmokelib/multiversionconstants.py

@@ -2,7 +2,9 @@
 import os
 import shutil
 from subprocess import DEVNULL, STDOUT, CalledProcessError, call, check_output
+import http
 import requests
+from retry import retry
 
 import structlog
 import buildscripts.resmokelib.config as _config
@@ -38,11 +40,16 @@ def generate_mongo_version_file():
         mongo_version_fh.write("mongo_version: " + res)
 
 
+@retry(tries=5, delay=3)
 def get_releases_file_from_remote():
     """Get the latest releases.yml from github."""
     try:
         with open(RELEASES_YAML, "wb") as file:
-            file.write(requests.get(MASTER_RELEASES_REMOTE_FILE).content)
+            response = requests.get(MASTER_RELEASES_REMOTE_FILE)
+            if response.status_code != http.HTTPStatus.OK:
+                raise RuntimeError("Http response for releases yml file was not 200 but was " +
+                                   response.status_code)
+            file.write(response.content)
         LOGGER.info(f"Got releases.yml file remotely: {MASTER_RELEASES_REMOTE_FILE}")
     except Exception as exc:
         LOGGER.warning(f"Could not get releases.yml file remotely: {MASTER_RELEASES_REMOTE_FILE}")

buildscripts/resmokelib/run/__init__.py

@@ -1337,6 +1337,9 @@ class RunPlugin(PluginInterface):
         evergreen_options.add_argument("--versionId", dest="version_id", metavar="VERSION_ID",
                                        help="Sets the version ID of the task.")
 
+        evergreen_options.add_argument("--taskWorkDir", dest="work_dir", metavar="TASK_WORK_DIR",
+                                       help="Sets the working directory of the task.")
+
         evergreen_options.add_argument(
             "--projectConfigPath", dest="evg_project_config_path",
             help="Sets the path to evergreen project configuration yaml.")

buildscripts/resmokelib/run/generate_multiversion_exclude_tags.py

@@ -23,6 +23,7 @@ BACKPORT_REQUIRED_TAG = "backport_required_multiversion"
 ETC_DIR = "etc"
 BACKPORTS_REQUIRED_FILE = "backports_required_for_multiversion_tests.yml"
 BACKPORTS_REQUIRED_BASE_URL = "https://raw.githubusercontent.com/10gen/mongo"
+BACKPORTS_REQUIRED_BASE_URL_BACKUP = "https://raw.githubusercontent.com/mongodb/mongo"
 
 
 def get_installation_access_token(app_id: int, private_key: str,
@@ -87,11 +88,16 @@ def get_old_yaml(commit_hash, expansions_file):
         expansions["app_id_10gen_mongo"], expansions["private_key_10gen_mongo"],
         expansions["installation_id_10gen_mongo"])
 
-    response = requests.get(
-        f'{BACKPORTS_REQUIRED_BASE_URL}/{commit_hash}/{ETC_DIR}/{BACKPORTS_REQUIRED_FILE}',
-        headers={
-            'Authorization': f'token {access_token_10gen_mongo}',
-        })
+    url = f'{BACKPORTS_REQUIRED_BASE_URL}/{commit_hash}/{ETC_DIR}/{BACKPORTS_REQUIRED_FILE}'
+    response = requests.get(url, headers={
+        'Authorization': f'token {access_token_10gen_mongo}',
+    })
+
+    if response.status_code != requests.codes["ok"]:
+        print(f"Request to {url} failed with status {response.status_code}")
+        url = f'{BACKPORTS_REQUIRED_BASE_URL_BACKUP}/{commit_hash}/{ETC_DIR}/{BACKPORTS_REQUIRED_FILE}'
+        print(f"Trying {url} instead.")
+        response = requests.get(url)
 
     # If the response was successful, no exception will be raised.
     response.raise_for_status()

buildscripts/resmokelib/testing/fixtures/shardedcluster.py

@@ -387,6 +387,7 @@ class ShardedClusterFixture(interface.Fixture, interface._DockerComposeInterface
             del mongod_options["shardsvr"]
             mongod_options["configsvr"] = ""
             replset_config_options["configsvr"] = True
+            mongod_options["set_parameters"]["featureFlagTransitionToCatalogShard"] = "true"
             mongod_options["storageEngine"] = "wiredTiger"
 
             configsvr_options = self.configsvr_options.copy()
@@ -437,6 +438,8 @@ class ShardedClusterFixture(interface.Fixture, interface._DockerComposeInterface
         """Return options that may be passed to a mongos."""
         mongos_options = self.mongos_options.copy()
         mongos_options["configdb"] = self.configsvr.get_internal_connection_string()
+        if self.config_shard is not None:
+            mongos_options["set_parameters"]["featureFlagTransitionToCatalogShard"] = "true"
         mongos_options["set_parameters"] = mongos_options.get("set_parameters",
                                                               self.fixturelib.make_historic(
                                                                   {})).copy()

buildscripts/resmokelib/testing/hooks/run_query_stats.py

@@ -8,8 +8,7 @@ from buildscripts.resmokelib.testing.hooks.interface import Hook
 from bson import binary
 import pymongo.errors
 
-QUERY_FEATURE_NOT_ALLOWED_CODE = 224
-QUERY_STATS_NOT_ENABLED_CODE = 7373500
+QUERY_STATS_NOT_ENABLED_CODES = [224, 7373500, 6579000]
 
 
 class RunQueryStats(Hook):
@@ -41,11 +40,11 @@ class RunQueryStats(Hook):
                     assert "metrics" in operation
                     assert "asOf" in operation
         except pymongo.errors.OperationFailure as err:
-            if not self.allow_feature_not_supported or err.code != QUERY_FEATURE_NOT_ALLOWED_CODE:
-                raise err
-            else:
-                self.logger.info("Encountered a 'QueryFeatureNotAllowed' error. "
+            if self.allow_feature_not_supported and err.code in QUERY_STATS_NOT_ENABLED_CODES:
+                self.logger.info("Encountered an error while running $queryStats. "
                                  "$queryStats will not be run for this test.")
+            else:
+                raise err
 
     def after_test(self, test, test_report):
         self.verify_query_stats({})
@@ -58,8 +57,8 @@ class RunQueryStats(Hook):
             self.client.admin.command("setParameter", 1, internalQueryStatsCacheSize="0%")
             self.client.admin.command("setParameter", 1, internalQueryStatsCacheSize="1%")
         except pymongo.errors.OperationFailure as err:
-            if not self.allow_feature_not_supported or err.code != QUERY_STATS_NOT_ENABLED_CODE:
-                raise err
-            else:
+            if self.allow_feature_not_supported and err.code in QUERY_STATS_NOT_ENABLED_CODES:
                 self.logger.info("Encountered an error while configuring the query stats store. "
                                  "Query stats will not be collected for this test.")
+            else:
+                raise err

buildscripts/resmokelib/testing/report.py

@@ -5,6 +5,7 @@ This is used to support additional test status and timing information for the re
 """
 
 import copy
+import os
 import threading
 import time
 import unittest
@@ -116,6 +117,7 @@ class TestReport(unittest.TestResult):
         unittest.TestResult.startTest(self, test)
 
         test_info = TestInfo(test.id(), test.test_name, test.dynamic)
+        test_info.group_id = f"job{self.job_num}"
 
         basename = test.basename()
         command = test.as_command()
@@ -140,6 +142,11 @@ class TestReport(unittest.TestResult):
         # Set up logging handlers to capture exceptions.
         test_info.exception_extractors = logging.loggers.configure_exception_capture(test_logger)
 
+        test_info.log_info = {
+            "log_name": logging.loggers.get_evergreen_log_name(self.job_num, test.id()),
+            "logs_to_merge": [logging.loggers.get_evergreen_log_name(self.job_num)],
+            "rendering_type": "resmoke", "version": 0
+        }
         test_info.url_endpoint = url_endpoint
         if self.logging_prefix is not None:
             test_logger.info(self.logging_prefix)
@@ -303,19 +310,18 @@ class TestReport(unittest.TestResult):
             for test_info in self.test_infos:
                 result = {
                     "test_file": test_info.test_file,
+                    "group_id": test_info.group_id,
                     "status": test_info.evergreen_status,
                     "exit_code": test_info.return_code,
                     "start": test_info.start_time,
                     "end": test_info.end_time,
                     "elapsed": test_info.end_time - test_info.start_time,
+                    "log_info": test_info.log_info,
                 }
 
                 if test_info.display_test_name is not None:
                     result["display_test_name"] = test_info.display_test_name
 
-                if test_info.group_id is not None:
-                    result["group_id"] = test_info.group_id
-
                 if test_info.url_endpoint is not None:
                     result["url"] = test_info.url_endpoint
                     result["url_raw"] = test_info.url_endpoint + "?raw=1"
@@ -345,6 +351,7 @@ class TestReport(unittest.TestResult):
             test_info = TestInfo(test_file, test_file, is_dynamic)
             test_info.display_test_name = result.get("display_test_name")
             test_info.group_id = result.get("group_id")
+            test_info.log_info = result.get("log_info")
             test_info.url_endpoint = result.get("url")
             test_info.status = result["status"]
             test_info.evergreen_status = test_info.status
@@ -398,16 +405,17 @@ class TestInfo(object):
 
         self.test_id = test_id
         self.test_file = test_file
+        self.group_id = None
         self.display_test_name = None
         self.dynamic = dynamic
         self.loggers = []
 
-        self.group_id = None
         self.start_time = None
         self.end_time = None
         self.status = None
         self.evergreen_status = None
         self.return_code = None
+        self.log_info = None
         self.url_endpoint = None
         self.exception_extractors = []
         self.error = None

buildscripts/resmokelib/utils/__init__.py

@@ -86,7 +86,7 @@ def get_task_name_without_suffix(task_name, variant_name):
     """Return evergreen task name without suffix added to the generated task.
 
     Remove evergreen variant name, numerical suffix and underscores between them from evergreen task name.
-    Example: "noPassthrough_0_enterprise-rhel-80-64-bit-dynamic-required" -> "noPassthrough"
+    Example: "noPassthrough_0_enterprise-rhel-8-64-bit-dynamic-required" -> "noPassthrough"
     """
     task_name = task_name if task_name else ""
     return re.sub(fr"(_[0-9]+)?(_{variant_name})?$", "", task_name)

buildscripts/setup_spawnhost_coredump

@@ -26,25 +26,35 @@ if [[ "${machine}" = "Cygwin" ]]; then
 
         echo "----------------------"
         echo -e "\n=> Setting _NT_SOURCE_PATH environment variable for debuggers to pick up source files."
-        SRC_DIR_HASH=$(readlink -f /cygdrive/z/data/mci/source-*)
-        SRC_DIR="${SRC_DIR_HASH}/src"
+        SRC_DIR_HASH=$(find /cygdrive/z/data/mci -name 'source-*' | head -n 1 | xargs -I% basename %)
+        SRC_DIR="Z:\data\mci\\${SRC_DIR_HASH}\src"
         echo "Source Path: [${SRC_DIR}]"
         set -x;
         setx _NT_SOURCE_PATH "${SRC_DIR}"
         { set +x; } 2>/dev/null
 
         echo -e "\n=> Setting _NT_SYMBOL_PATH environment variable for debuggers to pick up the symbols."
+        DBG_SYMBOLS_HASH=$(find /cygdrive/z/data/mci -name 'artifacts-*dist_test_debug' | head -n 1 | xargs -I% basename %)
+        DBG_SYMBOLS_WINPATH="\"Z:\data\mci\\${DBG_SYMBOLS_HASH}\extracted_symbols\dist-test\bin;srv*;\""
         DBG_ARCHIVE_PARENT=$(readlink -f /cygdrive/z/data/mci/artifacts-*dist_test_debug)
         DBG_ARCHIVE=$(readlink -f ${DBG_ARCHIVE_PARENT}/debugsymbols-*.zip)
         DBG_ARCHIVE_TARGET_PARENT="${DBG_ARCHIVE_PARENT}/extracted_symbols"
         DBG_ARCHIVE_TARGET="${DBG_ARCHIVE_TARGET_PARENT}/dist-test/bin"
         echo "Symbols Dir: [${DBG_ARCHIVE_TARGET}]"
 
+        echo -e "\n=> Copying .natvis file to Visual Studio's expected directories (System for 2017/2019 and User)."
+        set -x;
+        cp "/cygdrive/z/data/mci/${SRC_DIR_HASH}/buildscripts/win/mongodb.natvis" /cygdrive/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/Professional/Common7/Packages/Debugger/Visualizers
+        cp "/cygdrive/z/data/mci/${SRC_DIR_HASH}/buildscripts/win/mongodb.natvis" /cygdrive/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Professional/Common7/Packages/Debugger/Visualizers
+        mkdir "${USERPROFILE}/Documents/Visual Studio 2022/Visualizers"
+        cp "/cygdrive/z/data/mci/${SRC_DIR_HASH}/buildscripts/win/mongodb.natvis" "${USERPROFILE}/Documents/Visual Studio 2022/Visualizers"
+        { set +x; } 2>/dev/null
+
         echo -e "\n=> Extracting Symbol files."
         set -x;
         mkdir -p ${DBG_ARCHIVE_TARGET_PARENT}
         unzip -n ${DBG_ARCHIVE} -d ${DBG_ARCHIVE_TARGET_PARENT}
-        setx _NT_SYMBOL_PATH "${DBG_ARCHIVE_TARGET};srv*;"
+        setx _NT_SYMBOL_PATH "${DBG_SYMBOLS_WINPATH}"
         { set +x; } 2>/dev/null
 
         echo -e "\n=> Extracting Core Dumps to Desktop."
@@ -93,6 +103,7 @@ if [[ "${machine}" = "Cygwin" ]]; then
         if [[ -z $(ls ${COREDUMP_ARCHIVE_TARGET}/dump* 2>/dev/null) ]]; then
             echo "No core dumps found."
         fi
+
         { set +x; } 2>/dev/null
         echo "Copied to Desktop."
     } &> ${out_dir}
@@ -173,7 +184,7 @@ fi' >> .bash_profile
         archive_fail "debug"
     fi
 
-    UNITTEST_ARCHIVE=$(ls /data/mci/artifacts-*run_unittests/mongo-unittests-*.tgz 2>/dev/null)
+    UNITTEST_ARCHIVE=$(ls /data/mci/artifacts-*run_unittests*/mongo-unittests-*.tgz 2>/dev/null)
     if [[ -n $UNITTEST_ARCHIVE ]]; then
         tar --wildcards --strip-components=0 -xzf $UNITTEST_ARCHIVE 'bin/*' &
         tar --wildcards -xzf $UNITTEST_ARCHIVE 'lib/*' &
@@ -181,9 +192,10 @@ fi' >> .bash_profile
         archive_fail "unittest"
     fi
 
-    BENCHMARK_ARCHIVE=$(ls /data/mci/artifacts-*compile_upload_benchmarks/mongodb_mongo_*.tgz 2>/dev/null)
+    BENCHMARK_ARCHIVE=$(ls /data/mci/artifacts-*compile_upload_benchmarks/benchmarks-*.tgz 2>/dev/null)
     if [[ -n $BENCHMARK_ARCHIVE ]]; then
-        tar --wildcards --strip-components=2 -xzf $BENCHMARK_ARCHIVE '*/bin/*' &
+        tar --wildcards --strip-components=0 -xzf $BENCHMARK_ARCHIVE 'bin/*' &
+        tar --wildcards -xzf $BENCHMARK_ARCHIVE 'lib/*' &
     else
         archive_fail "benchmark"
     fi

buildscripts/testmatrix/getdisplaytaskname.py

@@ -1,7 +1,7 @@
 """
 Get the display task name from the execution task and the variant.
 
-Get an execution task name like this: multiversion_auth_0_enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required
+Get an execution task name like this: multiversion_auth_0_enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required
 Into a display task name like this: multiversion_auth
 """
 

buildscripts/tests/test_burn_in_tests.py

@@ -579,7 +579,7 @@ class TestBurnInTestsOutput(unittest.TestCase):
     def test_valid_yaml(self):
         process = subprocess.run([
             sys.executable, "buildscripts/burn_in_tests.py", "run", "--build-variant",
-            "enterprise-rhel-80-64-bit-dynamic-classic-engine", "--yaml", "--evg-project-file",
+            "enterprise-rhel-8-64-bit-dynamic-classic-engine", "--yaml", "--evg-project-file",
             "etc/evergreen.yml"
         ], text=True, capture_output=True)
         output = process.stdout

buildscripts/tests/util/test_taskname.py

@@ -28,7 +28,7 @@ class TestRemoveGenSuffix(unittest.TestCase):
 
 class TestDetermineTaskBaseName(unittest.TestCase):
     def test_task_name_with_build_variant_should_strip_bv_and_sub_task_index(self):
-        bv = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required"
+        bv = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
         task_name = f"auth_23_{bv}"
 
         base_task_name = under_test.determine_task_base_name(task_name, bv)
@@ -36,7 +36,7 @@ class TestDetermineTaskBaseName(unittest.TestCase):
         self.assertEqual("auth", base_task_name)
 
     def test_task_name_without_build_variant_should_strip_sub_task_index(self):
-        bv = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required"
+        bv = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
         task_name = "auth_314"
 
         base_task_name = under_test.determine_task_base_name(task_name, bv)
@@ -44,7 +44,7 @@ class TestDetermineTaskBaseName(unittest.TestCase):
         self.assertEqual("auth", base_task_name)
 
     def test_task_name_without_build_variant_or_subtask_index_should_self(self):
-        bv = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required"
+        bv = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
         task_name = "auth"
 
         base_task_name = under_test.determine_task_base_name(task_name, bv)

buildscripts/win/mongodb.natvis

@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?> 
+<?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
   <!--
-  NatVis Documentation: 
+  NatVis Documentation:
   https://docs.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects?view=vs-2017
-  
+
   Boost Visualizers:
   https://marketplace.visualstudio.com/items?itemName=ArkadyShapkin.CDebuggerVisualizersforVS2017
   https://github.com/KindDragon/CPPDebuggerVisualizers
 
   To load in Visual Studio, the natvis file must be in the Visual Studio project.
+   Note: with buildscripts/setup_spawnhost_coredump, this file should be automatically placed in the user-specific Natvis directory.
+   https://learn.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects?view=vs-2022#BKMK_natvis_location
   To load in WinDBG, run ".nvload mongdb.natvis"
   -->
   <Type Name="mongo::Status">
@@ -63,16 +65,16 @@
     <Expand>
       <CustomListItems>
         <Variable Name="Code" InitialValue="(const char*)this+4"/>
-        
+
         <Item Name="code">Code+4,[*(int32_t*)(Code)-1]s8</Item>
         <Item Name="scope">*(mongo::BSONObjData*)(Code+*(int32_t*)(Code)+4)</Item>
       </CustomListItems>
     </Expand>
   </Type>
 
-  <!-- 
+  <!--
   It it not possible to use variables to calculate contents in the DisplayString nodes.
-  
+
   this+strlen((char*)&amp;name)+2: Skips over the type byte and the name with its null terminator to get to the beginning of the value
   -->
   <Type Name="mongo::BSONElementData">
@@ -221,7 +223,7 @@
     <!-- MinKey/MaxKey -->
     <DisplayString Condition="*(char*)data==-1">{{ {data+1,s8}, MinKey }}</DisplayString>
     <DisplayString Condition="*(char*)data==0x7f">{{ {data+1,s8}, MaxKey }}</DisplayString>
-    
+
     <Expand>
         <Item Name="name">(const char*)data+1,s8</Item>
         <Item Name="value">(const mongo::BSONElementData*)data,na</Item>

copybara.sky

@@ -7,13 +7,13 @@ core.workflow(
     name = "default",
     origin = git.origin(
         url = sourceUrl,
-        ref = "master",
+        ref = "v7.3",
         # VersionSelector
     ),
     destination = git.destination(
         url = destinationUrl,
-        fetch = "master",
-        push = "master",
+        fetch = "v7.3",
+        push = "v7.3",
     ),
     # Change path to the folder you want to publish publicly
     origin_files = glob(["**"], exclude=["src/mongo/db/modules/**"]),

copybara.staging.sky

@@ -7,13 +7,13 @@ core.workflow(
     name = "default",
     origin = git.origin(
         url = sourceUrl,
-        ref = "master",
+        ref = "v7.3",
         # VersionSelector
     ),
     destination = git.destination(
         url = destinationUrl,
-        fetch = "master",
-        push = "master",
+        fetch = "v7.3",
+        push = "v7.3",
     ),
     # Change path to the folder you want to publish publicly
     origin_files = glob(["**"], exclude=["src/mongo/db/modules/**"]),

distsrc/README

@@ -83,5 +83,6 @@ LICENSE
   2018 are published under the AGPL. All versions released after October
   16, 2018, including patch fixes for prior versions, are published under
   the Server Side Public License (SSPL) v1. See individual files for
-  details.
+  details which will specify the license applicable to each file. Files
+  subject to the SSPL will be noted in their headers.
 

docs/evergreen-testing/burn_in_tags.md

@@ -11,7 +11,7 @@ original build variants, `burn_in_tags` runs them on the burn_in build variants
 ## How to use it
 
 You can use `burn_in_tags` on evergreen by selecting the `burn_in_tags_gen` task when creating a patch.
-The burn_in build variants, i.e., `enterprise-rhel-80-64-bit-inmem` and `enterprise-rhel-80-64-bit-multiversion`
+The burn_in build variants, i.e., `enterprise-rhel-8-64-bit-inmem` and `enterprise-rhel-8-64-bit-multiversion`
 will be generated, each of which will have a `burn_in_tests` task generated by the
 [mongo-task-generator](https://github.com/mongodb/mongo-task-generator). `burn_in_tests` task, a
 [generated task](task_generation.md), may have multiple sub-tasks which run the test suites only for the new, or changed, or

docs/testing/fsm_concurrency_testing_framework.md

@@ -21,13 +21,11 @@ function.
 
 ![fsm.png](../images/testing/fsm.png)
 
-The runner provides three modes of execution for workloads: serial, parallel,
-and composed. Serial mode runs the provided workloads one after the other,
+The runner provides two modes of execution for workloads: serial and parallel.
+Serial mode runs the provided workloads one after the other,
 waiting for all threads of a workload to complete before moving on to the next
 workload. Parallel mode runs subsets of the provided workloads in separate
-threads simultaneously. Composed mode runs subsets of the provided workloads in
-the same threads simultaneously, with each thread moving between the states of
-multiple workloads.
+threads simultaneously.
 
 New methods were added to allow for finer-grained assertions under different
 situations. For example, a test that inserts a document into a collection, and
@@ -103,9 +101,8 @@ It's best to also declare states within its own closure so as not to interfere
 with the scope of $config. Each state takes two arguments, the db object and the
 collection name. For later, note that this db and collection are the only one
 that you can be guaranteed to "own" when asserting. Try to make each state a
-discrete unit of work that can stand alone without the other states (in fact, an
-FSM that requires another state to run before it will probably not work in
-Composed mode). Additionally, try to define each function that makes up a state
+discrete unit of work that can stand alone without the other states.
+Additionally, try to define each function that makes up a state
 with a name as opposed to anonymously - this makes easier to read backtraces
 when things go wrong.
 
@@ -362,11 +359,9 @@ runWorkloads functions, the third argument, can contain the following options
 (some depend on the run mode):
 
 * `numSubsets` - Not available in serial mode, determines how many subsets of
-  workloads to execute in parallel or composed mode
+  workloads to execute in parallel mode
 * `subsetSize` - Not available in serial mode, determines how large each subset of
   workloads executed is
-* `iterations` - Only available in composed mode, determines how many transitions
-  to perform between states in a single thread of composition.
 
 #### fsm_all.js
 
@@ -385,8 +380,8 @@ settings in `$config`.
 
 #### fsm_all_replication.js
 
-Sets up a replica set (with 3 mongods by default) and runs workloads serially,
-in parallel, or in composed mode. For example,
+Sets up a replica set (with 3 mongods by default) and runs workloads serially or
+in parallel. For example,
 
 `runWorkloadsSerially([<workload1>, <workload2>, ...], { replication: true } )`
 
@@ -396,7 +391,7 @@ primary.
 #### fsm_all_sharded.js
 
 Sets up a sharded cluster (with 2 shards and 1 mongos by default) and runs
-workloads serially, in parallel, or in composed mode. For example,
+workloads serially or in parallel. For example,
 
 `runWorkloadsInParallel([<workload1>, <workload2>, ...], { sharded: true } )`
 
@@ -405,8 +400,7 @@ creates a sharded cluster and runs workloads in parallel.
 #### fsm_all_sharded_replication.js
 
 Sets up a sharded cluster (with 2 shards, each having 3 replica set members, and
-1 mongos by default) and runs workloads serially, in parallel, or in composed
-mode.
+1 mongos by default) and runs workloads serially or in parallel.
 
 ### Excluding a workload
 

etc/backports_required_for_multiversion_tests.yml

@@ -21,6 +21,16 @@
 #
 last-continuous:
   all:
+  - test_file: jstests/replsets/ignore_dbcheck_in_startup_recovery.js
+    ticket: SERVER-30832
+  - test_file: jstests/core/write/update/upsert_nor.js
+    ticket: SERVER-91700
+  - test_file: jstests/replsets/ignore_dbcheck_in_rollback.js
+    ticket: SERVER-30832
+  - test_file: jstests/replsets/ignore_dbcheck_in_initial_sync.js
+    ticket: SERVER-80340
+  - test_file: jstests/replsets/dbcheck_skip_applying_batch_on_secondary_parameter.js
+    ticket: SERVER-88885
   - test_file: jstests/sharding/config_shards_on_repl_set_changes.js
     ticket: SERVER-21185
   - test_file: jstests/sharding/query/find_and_modify_without_two_phase.js
@@ -33,6 +43,8 @@ last-continuous:
     ticket: SERVER-50792
   - test_file: jstests/sharding/refine_collection_shard_key_basic.js
     ticket: SERVER-50792
+  - test_file: jstests/core/index/elemmatch_index.js
+    ticket: SERVER-90747
   - test_file: jstests/replsets/tenant_migration_fetch_committed_transactions_retry.js
     ticket: SERVER-51943
   - test_file: jstests/sharding/query/collation_shard_targeting_hashed_shard_key.js
@@ -394,7 +406,7 @@ last-continuous:
   - test_file: jstests/sharding/query/sharded_lookup_execution.js
     ticket: SERVER-77427
   - test_file: jstests/sharding/multi_collection_transaction_placement_conflict_workaround.js
-    ticket: SERVER-82353
+    ticket: SERVER-86583
   - test_file: jstests/sharding/fsync_lock_unlock.js
     ticket: SERVER-73685
   - test_file: jstests/sharding/fsync_lock_ddl_lock.js
@@ -557,17 +569,105 @@ last-continuous:
     ticket: SERVER-84130
   - test_file: jstests/noPassthrough/disallow_new_transactions_at_shutdown_on_mongos.js
     ticket: SERVER-77667
+  - test_file: jstests/core/timeseries/timeseries_collmod.js
+    ticket: SERVER-83370
   - test_file: jstests/core/timeseries/timeseries_lookup.js
     ticket: SERVER-79637
-  - test_file: jstests/core/notablescan.js
+  - test_file: jstests/noPassthrough/notablescan.js
     ticket: SERVER-83119
   - test_file: jstests/sharding/clustered_coll_scan.js
     ticket: SERVER-83119
   - test_file: jstests/sharding/eof_plan.js
     ticket: SERVER-83119
+  - test_file: jstests/core/command_let_variables_expressions.js
+    ticket: SERVER-89268
+  - test_file: jstests/sharding/analyze_shard_key/sample_write_queries_sharded.js
+    ticket: SERVER-89268
+  - test_file: jstests/sharding/analyze_shard_key/sample_write_queries_unsharded.js
+    ticket: SERVER-89268
+  - test_file: jstests/change_streams/split_large_event_with_other_stages.js
+    ticket: SERVER-85848
+  - test_file: jstests/sharding/timeseries_drop.js
+    ticket: SERVER-84589
+  - test_file: jstests/sharding/updateOne_without_shard_key/write_without_shard_key_single_shard_data_placement_change.js
+    ticket: SERVER-87191
+  - test_file: jstests/core/query/bittest.js
+    ticket: SERVER-86419
+  - test_file: jstests/core/timeseries/timeseries_project.js
+    ticket: SERVER-87987
+  - test_file: jstests/core/administrative/apply_ops/apply_ops1.js
+    ticket: SERVER-82349
+  - test_file: jstests/sharding/swallow_unnecessary_uuid_mismatch_error.js
+    ticket: SERVER-79049
+  - test_file: jstests/sharding/view_query_readConcern_available.js
+    ticket: SERVER-86667
+  - test_file: jstests/replsets/reconstruct_prepared_transactions_initial_sync.js
+    ticket: SERVER-89618
+  - test_file: jstests/core/timeseries/timeseries_computed_field.js
+    ticket: SERVER-88072
+  - test_file: jstests/core/query/explain/explain_skip.js
+    ticket: SERVER-88949
+  - test_file: jstests/core/timeseries/timeseries_geonear_lookup.js
+    ticket: SERVER-81454
+  - test_file: jstests/sharding/move_chunk_deferred_lookup.js
+    ticket: SERVER-89859
+  - test_file: jstests/sharding/secondaries_clear_filtering_metadata.js
+    ticket: SERVER-86669
+  - test_file: jstests/aggregation/group_by_objectid.js
+    ticket: SERVER-90173
+  - test_file: jstests/replsets/catchup_ignores_old_heartbeats.js
+    ticket: SERVER-86674
+  - test_file: jstests/core/timeseries/timeseries_groupby_reorder.js
+    ticket: SERVER-87961
+  - test_file: jstests/core/timeseries/timeseries_lastpoint.js
+    ticket: SERVER-87961
+  - test_file: jstests/core/query/in_expression_plan_cache.js
+    ticket: SERVER-83712
+  - test_file: jstests/core/index/index_count_scan.js
+    ticket: SERVER-90461
+  - test_file: jstests/core/timeseries/bucket_unpacking_with_sort_negative.js
+    ticket: SERVER-90833
+  - test_file: jstests/aggregation/match_swapping_renamed_fields.js
+    ticket: SERVER-90869
+  - test_file: jstests/sharding/updateOne_without_shard_key/write_without_shard_key_single_shard_data_placement_change.js
+    ticket: SERVER-91114
+  - test_file: jstests/aggregation/sources/redact/root_redact.js
+    ticket: SERVER-91339
+  - test_file: jstests/core/timeseries/timeseries_shadowing_meta_project_pushdown.js
+    ticket: SERVER-90995
+  - test_file: jstests/core/timeseries/timeseries_cursor_batches.js
+    ticket: SERVER-91512
+  - test_file: jstests/change_streams/split_large_event.js
+    ticket: SERVER-91406
+  - test_file: jstests/core/sparse_index_supports_ne_null.js
+    ticket: SERVER-37164
+  - test_file: jstests/aggregation/bugs/add_fields_adds_to_missing_fields.js
+    ticket: SERVER-91784
+  - test_file: jstests/sharding/query/find_initialize_runtime_variables.js
+    ticket: SERVER-88647
+  - test_file: jstests/core/query/plan_cache/match_or_duplicate_predicate_plan_cache.js
+    ticket: SERVER-92603
+  - test_file: jstests/replsets/backwards_compatible_timeseries_catalog_options.js
+    ticket: SERVER-91195
+  - test_file: jstests/change_streams/timeseries.js
+    ticket: SERVER-91195
+  - test_file: jstests/core/timeseries/timeseries_insert_mixed_schema_bucket.js
+    ticket: SERVER-93099
+  - test_file: jstests/core/timeseries/timeseries_update_mixed_schema_bucket.js
+    ticket: SERVER-93099
   suites: null
 last-lts:
   all:
+  - test_file: jstests/replsets/ignore_dbcheck_in_startup_recovery.js
+    ticket: SERVER-30832
+  - test_file: jstests/core/write/update/upsert_nor.js
+    ticket: SERVER-91700
+  - test_file: jstests/replsets/ignore_dbcheck_in_rollback.js
+    ticket: SERVER-30832
+  - test_file: jstests/replsets/ignore_dbcheck_in_initial_sync.js
+    ticket: SERVER-80340
+  - test_file: jstests/replsets/dbcheck_skip_applying_batch_on_secondary_parameter.js
+    ticket: SERVER-88885
   - test_file: jstests/sharding/config_shards_on_repl_set_changes.js
     ticket: SERVER-21185
   - test_file: jstests/core/query/null_query_semantics.js
@@ -618,6 +718,8 @@ last-lts:
     ticket: SERVER-50792
   - test_file: jstests/sharding/refine_collection_shard_key_basic.js
     ticket: SERVER-50792
+  - test_file: jstests/core/index/elemmatch_index.js
+    ticket: SERVER-90747
   - test_file: jstests/replsets/node_restarts_no_oplog_entry_at_stable.js
     ticket: SERVER-51049
   - test_file: jstests/replsets/awaitable_hello_errors_on_horizon_change.js
@@ -1015,7 +1117,7 @@ last-lts:
   - test_file: jstests/sharding/query/sharded_lookup_execution.js
     ticket: SERVER-77427
   - test_file: jstests/sharding/multi_collection_transaction_placement_conflict_workaround.js
-    ticket: SERVER-82353
+    ticket: SERVER-86583
   - test_file: jstests/sharding/fsync_lock_unlock.js
     ticket: SERVER-73685
   - test_file: jstests/sharding/fsync_lock_ddl_lock.js
@@ -1180,12 +1282,86 @@ last-lts:
     ticket: SERVER-84130
   - test_file: jstests/noPassthrough/disallow_new_transactions_at_shutdown_on_mongos.js
     ticket: SERVER-77667
+  - test_file: jstests/core/timeseries/timeseries_collmod.js
+    ticket: SERVER-83370
   - test_file: jstests/core/timeseries/timeseries_lookup.js
     ticket: SERVER-79637
-  - test_file: jstests/core/notablescan.js
+  - test_file: jstests/noPassthrough/notablescan.js
     ticket: SERVER-83119
   - test_file: jstests/sharding/clustered_coll_scan.js
     ticket: SERVER-83119
   - test_file: jstests/sharding/eof_plan.js
     ticket: SERVER-83119
+  - test_file: jstests/core/command_let_variables_expressions.js
+    ticket: SERVER-89268
+  - test_file: jstests/sharding/analyze_shard_key/sample_write_queries_sharded.js
+    ticket: SERVER-89268
+  - test_file: jstests/sharding/analyze_shard_key/sample_write_queries_unsharded.js
+    ticket: SERVER-89268
+  - test_file: jstests/change_streams/split_large_event_with_other_stages.js
+    ticket: SERVER-85848
+  - test_file: jstests/sharding/timeseries_drop.js
+    ticket: SERVER-84589
+  - test_file: jstests/core/query/bittest.js
+    ticket: SERVER-86419
+  - test_file: jstests/core/timeseries/timeseries_project.js
+    ticket: SERVER-87987
+  - test_file: jstests/core/administrative/apply_ops/apply_ops1.js
+    ticket: SERVER-82349
+  - test_file: jstests/sharding/swallow_unnecessary_uuid_mismatch_error.js
+    ticket: SERVER-79049
+  - test_file: jstests/sharding/view_query_readConcern_available.js
+    ticket: SERVER-86667
+  - test_file: jstests/replsets/reconstruct_prepared_transactions_initial_sync.js
+    ticket: SERVER-89618
+  - test_file: jstests/core/timeseries/timeseries_computed_field.js
+    ticket: SERVER-88072
+  - test_file: jstests/core/timeseries/timeseries_geonear_lookup.js
+    ticket: SERVER-81454
+  - test_file: jstests/sharding/move_chunk_deferred_lookup.js
+    ticket: SERVER-89859
+  - test_file: jstests/sharding/secondaries_clear_filtering_metadata.js
+    ticket: SERVER-86669
+  - test_file: jstests/aggregation/group_by_objectid.js
+    ticket: SERVER-90173
+  - test_file: jstests/replsets/catchup_ignores_old_heartbeats.js
+    ticket: SERVER-86674
+  - test_file: jstests/core/timeseries/timeseries_groupby_reorder.js
+    ticket: SERVER-87961
+  - test_file: jstests/core/timeseries/timeseries_lastpoint.js
+    ticket: SERVER-87961
+  - test_file: jstests/core/query/in_expression_plan_cache.js
+    ticket: SERVER-83712
+  - test_file: jstests/core/timeseries/bucket_unpacking_with_sort_negative.js
+    ticket: SERVER-90833
+  - test_file: jstests/sharding/direct_shard_connection_auth.js
+    ticket: SERVER-89994
+  - test_file: jstests/aggregation/match_swapping_renamed_fields.js
+    ticket: SERVER-90869
+  - test_file: jstests/sharding/updateOne_without_shard_key/write_without_shard_key_single_shard_data_placement_change.js
+    ticket: SERVER-91114
+  - test_file: jstests/aggregation/sources/redact/root_redact.js
+    ticket: SERVER-91339
+  - test_file: jstests/core/timeseries/timeseries_shadowing_meta_project_pushdown.js
+    ticket: SERVER-90995
+  - test_file: jstests/core/timeseries/timeseries_cursor_batches.js
+    ticket: SERVER-91512
+  - test_file: jstests/change_streams/split_large_event.js
+    ticket: SERVER-91406
+  - test_file: jstests/core/sparse_index_supports_ne_null.js
+    ticket: SERVER-37164
+  - test_file: jstests/aggregation/bugs/add_fields_adds_to_missing_fields.js
+    ticket: SERVER-91784
+  - test_file: jstests/sharding/query/find_initialize_runtime_variables.js
+    ticket: SERVER-88647
+  - test_file: jstests/core/query/plan_cache/match_or_duplicate_predicate_plan_cache.js
+    ticket: SERVER-92603
+  - test_file: jstests/replsets/backwards_compatible_timeseries_catalog_options.js
+    ticket: SERVER-91195
+  - test_file: jstests/change_streams/timeseries.js
+    ticket: SERVER-91195
+  - test_file: jstests/core/timeseries/timeseries_insert_mixed_schema_bucket.js
+    ticket: SERVER-93099
+  - test_file: jstests/core/timeseries/timeseries_update_mixed_schema_bucket.js
+    ticket: SERVER-93099
   suites: null

etc/evergreen_nightly.yml

@@ -13,29 +13,29 @@ include:
 
 - filename: etc/evergreen_yml_components/variants/misc/task_generation.yml
 ### Uncomment when using this file for a LTS or Rapid release branch. ###
-# - filename: etc/evergreen_yml_components/variants/misc/misc.yml
+- filename: etc/evergreen_yml_components/variants/misc/misc.yml
 
 - filename: etc/evergreen_yml_components/variants/amazon/test_release.yml
 ### Uncomment when using this file for a LTS or Rapid release branch. ###
-# - filename: etc/evergreen_yml_components/variants/amazon/test_dev.yml
+- filename: etc/evergreen_yml_components/variants/amazon/test_dev.yml
 
 - filename: etc/evergreen_yml_components/variants/atlas/test_release.yml
 
 - filename: etc/evergreen_yml_components/variants/debian/test_release.yml
 
 ### Comment out when using this file for a Rapid release branch. ###
-- filename: etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml
+# - filename: etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml
 
 - filename: etc/evergreen_yml_components/variants/macos/test_release.yml
 
 - filename: etc/evergreen_yml_components/variants/rhel/test_release.yml
 ### Uncomment when using this file for a LTS or Rapid release branch. ###
-# - filename: etc/evergreen_yml_components/variants/rhel/test_dev.yml
+- filename: etc/evergreen_yml_components/variants/rhel/test_dev.yml
 ### Uncomment when using this file for a LTS release branch. ###
 # - filename: etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
 
 ### Uncomment when using this file for a LTS or Rapid release branch. ###
-# - filename: etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
+- filename: etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
 
 - filename: etc/evergreen_yml_components/variants/suse/test_release.yml
 
@@ -43,7 +43,7 @@ include:
 
 - filename: etc/evergreen_yml_components/variants/windows/test_release.yml
 ### Uncomment when using this file for a LTS or Rapid release branch. ###
-# - filename: etc/evergreen_yml_components/variants/windows/test_dev.yml
+- filename: etc/evergreen_yml_components/variants/windows/test_dev.yml
 ### Uncomment when using this file for a LTS release branch. ###
 # - filename: etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml
 

etc/evergreen_timeouts.yml

@@ -11,6 +11,12 @@
 
 overrides:
 
+  # We increased the timeout since comparison results speed were slowed down due to resolving
+  # Object.entries correctly.
+  enterprise-amazon-linux2-arm64-all-feature-flags-fuzzers:
+  - task: aggregation_timeseries_fuzzer
+    exec_timeout: 150 # 2.5 hours
+
   enterprise-macos:
   - task: replica_sets_jscore_passthrough
     exec_timeout: 150  # 2.5 hours
@@ -20,7 +26,7 @@ overrides:
     exec_timeout: 150  # 2.5 hours
 
   # TODO: Delete me once all tests have been migrated over from complete-tsan
-  enterprise-rhel80-debug-complete-tsan:
+  enterprise-rhel8-debug-complete-tsan:
   - task: shard_merge_jscore_passthrough
     exec_timeout: 240  # 4 hours
   - task: shard_merge_causally_consistent_jscore_passthrough
@@ -38,7 +44,7 @@ overrides:
   - task: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm
     exec_timeout: 180  # 3 hours
 
-  enterprise-rhel80-debug-tsan:
+  enterprise-rhel8-debug-tsan:
   - task: aggregation_expression_multiversion_fuzzer
     exec_timeout: 600  # 10 hours
   - task: aggregation_multiversion_fuzzer
@@ -76,23 +82,29 @@ overrides:
   - task: replica_sets_jscore_passthrough
     exec_timeout: 150  # 2.5 hours
 
-  rhel80-asan:
+  rhel8-asan:
   - task: aggregation_timeseries_fuzzer
-    exec_timeout: 150  # 2.5 hours
+    exec_timeout: 360  # 6 hours
+  - task: aggregation_wildcard_fuzzer
+    exec_timeout: 300  # 5 hours
+  - task: aggregation_multiversion_fuzzer_last_continuous
+    exec_timeout: 300  # 5 hours
+  - task: aggregation_multiversion_fuzzer_last_lts
+    exec_timeout: 300  # 5 hours
 
-  rhel80-debug-ubsan:
+  rhel8-debugubsan:
   - task: update_timeseries_fuzzer
     exec_timeout: 150  # 2.5 hours
 
-  rhel80-debug-ubsan-classic-engine:
+  rhel8-debugubsan-classic-engine:
   - task: update_timeseries_fuzzer
     exec_timeout: 150  # 2.5 hours
 
-  rhel80-debug-aubsan-all-feature-flags:
+  rhel8-debugaubsan-all-feature-flags:
   - task: update_timeseries_fuzzer
     exec_timeout: 180  # 3 hours
 
-  rhel80-debug-aubsan-classic-engine:
+  rhel8-debugaubsan-classic-engine:
   - task: update_timeseries_fuzzer
     exec_timeout: 180  # 3 hours
 

etc/evergreen_yml_components/configuration.yml

@@ -73,7 +73,7 @@ modules:
 - name: enterprise
   repo: git@github.com:10gen/mongo-enterprise-modules.git
   prefix: src/mongo/db/modules
-  branch: master
+  branch: v7.3
 
 - name: wtdevelop
   repo: git@github.com:wiredtiger/wiredtiger.git
@@ -151,6 +151,7 @@ post:
 - func: "cleanup FUSE watchdog"
 - func: "cleanup environment"
 - func: "cleanup jepsen docker test"
+- func: "cleanup external auth test artifacts"
 
 # Timeout steps
 timeout:

etc/evergreen_yml_components/definitions.yml

@@ -158,13 +158,13 @@ variables:
   - enterprise-rhel-70-64-bit
   - enterprise-rhel-81-ppc64le
   - ubi8
-  - rhel80
-  - rhel-82-arm64
+  - rhel8
+  - rhel8-arm64
   - rhel90
   - rhel90-arm64
-  - enterprise-rhel-80-64-bit
-  - enterprise-rhel-80-64-bit-suggested  # For testing selinux.
-  - enterprise-rhel-82-arm64
+  - enterprise-rhel-8-64-bit
+  - enterprise-rhel-8-64-bit-suggested  # For testing selinux.
+  - enterprise-rhel8-arm64
   - enterprise-rhel-83-s390x
   - enterprise-rhel-90-64-bit
   - enterprise-rhel-90-arm64
@@ -354,6 +354,19 @@ functions:
       - "--change-dir=${extraction_change_dir}"
       - "${move_outputs}"
 
+  "extract benchmarks": &extract_benchmarks
+    command: subprocess.exec
+    display_name: "extract benchmarks"
+    params:
+      binary: bash
+      args:
+      - "src/evergreen/run_python_script.sh"
+      - "evergreen/functions/binaries_extract.py"
+      - "--tarball=mongo_benchmarks.tgz"
+      - "--extraction-command=${decompress}"
+      - "--change-dir=build/install"
+      - "--move-output=build/install/benchmarks.txt:build/"
+
   "get version expansions": &get_version_expansions
     command: s3.get
     params:
@@ -377,9 +390,9 @@ functions:
     params:
       aws_key: ${aws_key}
       aws_secret: ${aws_secret}
-      remote_file: ${project}/${build_variant}/${revision}/benchmarks/${build_id}.tgz
+      remote_file: ${mongo_benchmarks}
       bucket: mciuploads
-      extract_to: src
+      local_file: src/mongo_benchmarks.tgz
 
   "fetch corpus": &fetch_corpus
     command: s3.get
@@ -430,7 +443,7 @@ functions:
   "get buildnumber": &get_buildnumber
     command: keyval.inc
     params:
-      key: "${build_variant}_master"
+      key: "${build_variant}_${project}"
       destination: "builder_num"
 
   "run diskstats": &run_diskstats
@@ -605,6 +618,10 @@ functions:
         value: ${project}/${compile_variant}/${version_id}/binaries/mongo-jstestshell-debugsymbols-${revision_order_id}.tgz
       - key: mongo_artifacts
         value: ${project}/${compile_variant}/${version_id}/artifacts/${revision_order_id}.tgz
+      - key: mongo_benchmarks
+        value: ${project}/${compile_variant}/${version_id}/binaries/benchmarks-${revision_order_id}.${ext|tgz}
+      - key: mongo_benchmarks_debugsymbols
+        value: ${project}/${compile_variant}/${version_id}/binaries/benchmarksdebugsymbols-${revision_order_id}.${ext|tgz}
       - key: mongo_venv
         value: ${project}/${compile_variant}/${version_id}/venv/${revision_order_id}.tgz
       - key: mongo_fuzzer_corpus_mciuploads
@@ -767,6 +784,7 @@ functions:
   - *f_expansions_write
   - *set_up_credentials
   - *fetch_benchmarks
+  - *extract_benchmarks
 
   "f_multiversion_setup_exec": &do_multiversion_setup
     command: subprocess.exec
@@ -2451,6 +2469,14 @@ functions:
       args:
       - "./src/evergreen/antithesis_image_build_and_push.sh"
 
+  "cleanup external auth test artifacts":
+  - *f_expansions_write
+  - command: subprocess.exec
+    params:
+      binary: bash
+      args:
+        - "./src/evergreen/sasl_windows_cyrussasl_teardown.sh"
+
 
 #######################################
 #               Tasks                 #
@@ -2559,6 +2585,20 @@ tasks:
     vars:
       suite: multiversion_future_git_tag
 
+- <<: *task_template
+  name: sasl_windows_cyrussasl
+  tags: ["assigned_to_jira_team_server_security", "sasl", "experimental"]
+  commands:
+  - func: "f_expansions_write"
+  - func: "do setup"
+  - func: "f_expansions_write"
+  - command: subprocess.exec
+    params:
+      binary: bash
+      args:
+        - "src/evergreen/sasl_windows_cyrussasl_setup.sh"
+  - func: "run tests"
+
 - <<: *task_template
   name: jsCore
   tags: ["jscore", "common"]

etc/evergreen_yml_components/tasks/compile_tasks.yml

@@ -148,10 +148,10 @@ variables:
   - enterprise-macos-arm64
   - enterprise-rhel-70-64-bit
   - enterprise-rhel-81-ppc64le
-  - enterprise-rhel-80-64-bit
-  - enterprise-rhel-80-64-bit-coverage
-  - enterprise-rhel-80-64-bit-suggested
-  - enterprise-rhel-82-arm64
+  - enterprise-rhel-8-64-bit
+  - enterprise-rhel-8-64-bit-coverage
+  - enterprise-rhel-8-64-bit-suggested
+  - enterprise-rhel8-arm64
   - enterprise-rhel-83-s390x
   - enterprise-rhel-90-64-bit
   - enterprise-rhel-90-arm64
@@ -424,31 +424,43 @@ tasks:
   commands:
   - func: "scons compile"
     vars:
-      targets: install-benchmarks
+      targets: >-
+        install-benchmarks
+        archive-benchmarks
       compiling_for_test: true
-  - command: archive.targz_pack
-    params:
-      target: "benchmarks.tgz"
-      source_dir: "src"
-      include:
-      - "./build/benchmarks.txt"
-      - "./build/**_bm"
-      - "./build/**_bm.gcno"
-      - "./build/**_bm.exe"
-      - "./build/**_bm.pdb"
-      - "./build/**.so"
-      - "./build/**.debug"
   - command: s3.put
     params:
       aws_key: ${aws_key}
       aws_secret: ${aws_secret}
-      local_file: benchmarks.tgz
-      remote_file: ${project}/${build_variant}/${revision}/benchmarks/${build_id}.tgz
+      local_file: src/benchmarks.${ext|tgz}
+      remote_file: ${mongo_benchmarks}
       bucket: mciuploads
       permissions: public-read
       content_type: application/tar
       display_name: Benchmarks
 
+- name: compile_upload_benchmarks_debug
+  tags: ["assigned_to_jira_team_devprod_build"]
+  depends_on:
+  - name: compile_upload_benchmarks
+  commands:
+  - func: "scons compile"
+    vars:
+      targets: >-
+        install-benchmarks-debug
+        archive-benchmarks-debug
+      compiling_for_test: true
+  - command: s3.put
+    params:
+      aws_key: ${aws_key}
+      aws_secret: ${aws_secret}
+      local_file: src/benchmarks-debugsymbols.${ext|tgz}
+      remote_file: ${mongo_benchmarks_debugsymbols}
+      bucket: mciuploads
+      permissions: public-read
+      content_type: application/tar
+      display_name: Benchmarks Debug
+
 - &archive_dist_test
   name: archive_dist_test
   tags: ["assigned_to_jira_team_devprod_build"]
@@ -909,6 +921,86 @@ tasks:
       targets: install-unittests install-unittests-debug
       compiling_for_test: true
 
+- name: compile_and_run_unittests_first_quarter
+  exec_timeout_secs: 21600 # 6 hours
+  depends_on:
+  - name: compile_dist_test
+  commands:
+  - func: "scons compile"
+    vars:
+      targets: install-first-quarter-unittests install-first-quarter-unittests-debug
+      compiling_for_test: true
+  - func: "f_expansions_write"
+  - func: "run diskstats"
+  - func: "f_expansions_write"
+  - func: "monitor process threads"
+  - func: "collect system resource info"
+  - func: "run tests"
+    vars:
+      suite: unittests_first_quarter
+      install_dir: build/install/bin
+      exec_timeout_secs: 21600 # 6 hours
+
+- name: compile_and_run_unittests_second_quarter
+  exec_timeout_secs: 21600 # 6 hours
+  depends_on:
+  - name: compile_dist_test
+  commands:
+  - func: "scons compile"
+    vars:
+      targets: install-second-quarter-unittests install-second-quarter-unittests-debug
+      compiling_for_test: true
+  - func: "f_expansions_write"
+  - func: "run diskstats"
+  - func: "f_expansions_write"
+  - func: "monitor process threads"
+  - func: "collect system resource info"
+  - func: "run tests"
+    vars:
+      suite: unittests_second_quarter
+      install_dir: build/install/bin
+      exec_timeout_secs: 21600 # 6 hours
+
+- name: compile_and_run_unittests_third_quarter
+  exec_timeout_secs: 21600 # 6 hours
+  depends_on:
+  - name: compile_dist_test
+  commands:
+  - func: "scons compile"
+    vars:
+      targets: install-third-quarter-unittests install-third-quarter-unittests-debug
+      compiling_for_test: true
+  - func: "f_expansions_write"
+  - func: "run diskstats"
+  - func: "f_expansions_write"
+  - func: "monitor process threads"
+  - func: "collect system resource info"
+  - func: "run tests"
+    vars:
+      suite: unittests_third_quarter
+      install_dir: build/install/bin
+      exec_timeout_secs: 21600 # 6 hours
+
+- name: compile_and_run_unittests_fourth_quarter
+  exec_timeout_secs: 21600 # 6 hours
+  depends_on:
+  - name: compile_dist_test
+  commands:
+  - func: "scons compile"
+    vars:
+      targets: install-fourth-quarter-unittests install-fourth-quarter-unittests-debug
+      compiling_for_test: true
+  - func: "f_expansions_write"
+  - func: "run diskstats"
+  - func: "f_expansions_write"
+  - func: "monitor process threads"
+  - func: "collect system resource info"
+  - func: "run tests"
+    vars:
+      suite: unittests_fourth_quarter
+      install_dir: build/install/bin
+      exec_timeout_secs: 21600 # 6 hours
+
 - <<: *compile_unittests
   name: compile_unittests_future_git_tag_multiversion
   depends_on:
@@ -1274,7 +1366,6 @@ tasks:
   - func: "scons compile"
     vars:
       targets: >-
-        distsrc-${ext|tgz}
         archive-dist
         archive-dist-debug
         archive-jstestshell
@@ -1296,20 +1387,6 @@ tasks:
       binary: bash
       args:
       - "src/evergreen/package.sh"
-  - command: s3.put
-    params:
-      aws_key: ${aws_key}
-      aws_secret: ${aws_secret}
-      local_file: src/distsrc.${ext|tgz}
-      remote_file: ${project}/${build_variant}/${revision}/sources/mongo-src-${build_id}.${ext|tgz}
-      bucket: mciuploads
-      permissions: public-read
-      content_type: ${content_type|application/gzip}
-      display_name: Source tarball
-      # We only need to upload the source tarball from one of the build variants
-      # because it should be the same everywhere, so just use rhel70/rhel80/windows.
-      # TODO(SERVER-80479): remove rhel70 when support for it has been dropped.
-      build_variants: [rhel70, rhel80, windows]
   - command: s3.put
     params:
       optional: true
@@ -1428,6 +1505,7 @@ tasks:
   - command: shell.exec
     params:
       shell: bash
+      silent: true
       script: |
         set -oe
         echo "${release_tools_container_registry_password}" | podman login --password-stdin --username ${release_tools_container_registry_username} ${release_tools_container_registry}
@@ -1474,17 +1552,6 @@ tasks:
       local_file: src/mongo-cryptd.tgz
       build_variants: *mongocryptd_variants
   # Fetch the sources (on relevant variants only)
-  - command: s3.get
-    params:
-      aws_key: ${aws_key}
-      aws_secret: ${aws_secret}
-      remote_file: ${project}/${build_variant}/${revision}/sources/mongo-src-${build_id}.${ext|tgz}
-      bucket: mciuploads
-      local_file: src/distsrc.${ext|tgz}
-      # We only need to upload the source tarball from one of the build variants
-      # because it should be the same everywhere, so just use rhel70/rhel80/windows.
-      # TODO(SERVER-80479): remove rhel70 when support for it has been dropped.
-      build_variants: [rhel70, rhel80, windows]
   - func: "generate compile expansions"
   - func: "apply compile expansions"
   - func: "fetch dist debugsymbols"
@@ -1498,6 +1565,7 @@ tasks:
   - command: shell.exec
     params:
       shell: bash
+      silent: true
       script: |
         set -oe
         echo "${release_tools_container_registry_password}" | podman login --password-stdin --username ${release_tools_container_registry_username} ${release_tools_container_registry}
@@ -1537,21 +1605,6 @@ tasks:
       content_type: ${content_type|application/gzip}
       remote_file: ${push_path}-STAGE/${push_name}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}
       build_variants: *mongocryptd_variants
-  # Put the source tarball
-  - command: s3.put
-    params:
-      aws_secret: ${aws_secret}
-      local_file: src/mongodb-src-${src_suffix}.${ext|tar.gz}
-      aws_key: ${aws_key}
-      bucket: build-push-testing
-      permissions: public-read
-      content_type: ${content_type|application/gzip}
-      remote_file: ${push_path}-STAGE/${push_name}/mongodb-src-${src_suffix}-${task_id}.${ext|tar.gz}
-      # We only need to upload the source tarball from one of the build variants
-      # because it should be the same everywhere, so just use rhel70/rhel80/windows.
-      # TODO(SERVER-80479): remove rhel70 when support for it has been dropped.
-      build_variants: [rhel70, rhel80, windows]
-
   # Put the debug symbols
   # push directly to repo due to limitations in file size SERVER-63432
   - command: s3.put
@@ -1588,21 +1641,6 @@ tasks:
       remote_file: ${push_path}-STAGE/${push_name}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sig
       build_variants: *mongocryptd_variants
 
-  # Put the source tarball signature
-  - command: s3.put
-    params:
-      aws_secret: ${aws_secret}
-      local_file: src/mongodb-src-${src_suffix}.${ext|tar.gz}.sig
-      aws_key: ${aws_key}
-      bucket: build-push-testing
-      permissions: public-read
-      content_type: ${content_type|application/gzip}
-      remote_file: ${push_path}-STAGE/${push_name}/mongodb-src-${src_suffix}-${task_id}.${ext|tar.gz}.sig
-      # We only need to upload the source tarball from one of the build variants
-      # because it should be the same everywhere, so just use rhel70/rhel80/windows.
-      # TODO(SERVER-80479): remove rhel70 when support for it has been dropped.
-      build_variants: [rhel70, rhel80, windows]
-
   # Put the debug symbols signature
   - command: s3.put
     params:
@@ -1650,21 +1688,6 @@ tasks:
       remote_file: ${push_path}-STAGE/${push_name}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha1
       build_variants: *mongocryptd_variants
 
-  # Put the source tarball sha1
-  - command: s3.put
-    params:
-      aws_secret: ${aws_secret}
-      local_file: src/mongodb-src-${src_suffix}.${ext|tar.gz}.sha1
-      aws_key: ${aws_key}
-      permissions: public-read
-      bucket: build-push-testing
-      content_type: text/plain
-      remote_file: ${push_path}-STAGE/${push_name}/mongodb-src-${src_suffix}-${task_id}.${ext|tar.gz}.sha1
-      # We only need to upload the source tarball from one of the build variants
-      # because it should be the same everywhere, so just use rhel70/rhel80/windows.
-      # TODO(SERVER-80479): remove rhel70 when support for it has been dropped.
-      build_variants: [rhel70, rhel80, windows]
-
   # Put the debug symbols sha1
   - command: s3.put
     params:
@@ -1712,21 +1735,6 @@ tasks:
       remote_file: ${push_path}-STAGE/${push_name}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha256
       build_variants: *mongocryptd_variants
 
-  # Put the source tarball sha256
-  - command: s3.put
-    params:
-      aws_secret: ${aws_secret}
-      local_file: src/mongodb-src-${src_suffix}.${ext|tar.gz}.sha256
-      permissions: public-read
-      aws_key: ${aws_key}
-      bucket: build-push-testing
-      content_type: text/plain
-      remote_file: ${push_path}-STAGE/${push_name}/mongodb-src-${src_suffix}-${task_id}.${ext|tar.gz}.sha256
-      # We only need to upload the source tarball from one of the build variants
-      # because it should be the same everywhere, so just use rhel70/rhel80/windows.
-      # TODO(SERVER-80479): remove rhel70 when support for it has been dropped.
-      build_variants: [rhel70, rhel80, windows]
-
   # Put the debug symbols sha256
   - command: s3.put
     params:
@@ -1774,21 +1782,6 @@ tasks:
       remote_file: ${push_path}-STAGE/${push_name}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.md5
       build_variants: *mongocryptd_variants
 
-  # Put the source tarball md5
-  - command: s3.put
-    params:
-      aws_secret: ${aws_secret}
-      local_file: src/mongodb-src-${src_suffix}.${ext|tar.gz}.md5
-      aws_key: ${aws_key}
-      bucket: build-push-testing
-      permissions: public-read
-      content_type: text/plain
-      remote_file: ${push_path}-STAGE/${push_name}/mongodb-src-${src_suffix}-${task_id}.${ext|tar.gz}.md5
-      # We only need to upload the source tarball from one of the build variants
-      # because it should be the same everywhere, so just use rhel70/rhel80/windows.
-      # TODO(SERVER-80479): remove rhel70 when support for it has been dropped.
-      build_variants: [rhel70, rhel80, windows]
-
   # Put the debug symbols md5
   - command: s3.put
     params:
@@ -1889,11 +1882,6 @@ tasks:
          'destination': {'path': '${push_path}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}', 'bucket': '${push_bucket}'},
          'build_variants': *mongocryptd_variants}
 
-      #Source tarball
-      - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-src-${src_suffix}-${task_id}.${ext|tar.gz}', 'bucket': 'build-push-testing'},
-         'destination': {'path': 'src/mongodb-src-${src_suffix}.${ext|tar.gz}', 'bucket': '${push_bucket}'},
-         'build_variants': ['rhel70', 'windows']}
-
       #MSI (Windows only)
       - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-${push_name}-${push_arch}-${suffix}-${task_id}-signed.msi', 'bucket': 'build-push-testing'},
          'destination': {'path': '${push_path}/mongodb-${push_name}-${push_arch}-${suffix}-signed.msi', 'bucket': '${push_bucket}'},
@@ -1908,11 +1896,6 @@ tasks:
          'destination': {'path': '${push_path}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig', 'bucket': '${push_bucket}'},
          'build_variants': *mongocryptd_variants}
 
-      #Source tarball signature
-      - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-src-${src_suffix}-${task_id}.${ext|tar.gz}.sig', 'bucket': 'build-push-testing'},
-         'destination': {'path': 'src/mongodb-src-${src_suffix}.${ext|tar.gz}.sig', 'bucket': '${push_bucket}'},
-         'build_variants': ['rhel70', 'windows']}
-
       #SHA1 for binaries
       - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha1', 'bucket': 'build-push-testing'},
          'destination': {'path': '${push_path}/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1', 'bucket': '${push_bucket}'}}
@@ -1922,11 +1905,6 @@ tasks:
          'destination': {'path': '${push_path}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1', 'bucket': '${push_bucket}'},
          'build_variants': *mongocryptd_variants}
 
-      #SHA1 for source tarball
-      - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-src-${src_suffix}-${task_id}.${ext|tar.gz}.sha1', 'bucket': 'build-push-testing'},
-         'destination': {'path': 'src/mongodb-src-${src_suffix}.${ext|tar.gz}.sha1', 'bucket': '${push_bucket}'},
-         'build_variants': ['rhel70', 'windows']}
-
       #SHA1 for MSI
       - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-${push_name}-${push_arch}-${suffix}-${task_id}-signed.msi.sha1', 'bucket': 'build-push-testing'},
          'destination': {'path': '${push_path}/mongodb-${push_name}-${push_arch}-${suffix}-signed.msi.sha1', 'bucket': '${push_bucket}'},
@@ -1941,11 +1919,6 @@ tasks:
          'destination': {'path': '${push_path}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256', 'bucket': '${push_bucket}'},
          'build_variants': *mongocryptd_variants}
 
-      #SHA256 for source tarball
-      - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-src-${src_suffix}-${task_id}.${ext|tar.gz}.sha256', 'bucket': 'build-push-testing'},
-         'destination': {'path': 'src/mongodb-src-${src_suffix}.${ext|tar.gz}.sha256', 'bucket': '${push_bucket}'},
-         'build_variants': ['rhel70', 'windows']}
-
       #SHA256 for MSI files
       - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-${push_name}-${push_arch}-${suffix}-${task_id}-signed.msi.sha256', 'bucket': 'build-push-testing'},
          'destination': {'path': '${push_path}/mongodb-${push_name}-${push_arch}-${suffix}-signed.msi.sha256', 'bucket': '${push_bucket}'},
@@ -1960,11 +1933,6 @@ tasks:
          'destination': {'path': '${push_path}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5', 'bucket': '${push_bucket}'},
          'build_variants': *mongocryptd_variants}
 
-      #MD5 for source tarball
-      - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-src-${src_suffix}-${task_id}.${ext|tar.gz}.md5', 'bucket': 'build-push-testing'},
-         'destination': {'path': 'src/mongodb-src-${src_suffix}.${ext|tar.gz}.md5', 'bucket': '${push_bucket}'},
-         'build_variants': ['rhel70', 'windows']}
-
       #MD5 for MSIs
       - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-${push_name}-${push_arch}-${suffix}-${task_id}-signed.msi.md5', 'bucket': 'build-push-testing'},
          'destination': {'path': '${push_path}/mongodb-${push_name}-${push_arch}-${suffix}-signed.msi.md5', 'bucket': '${push_bucket}'},
@@ -2036,6 +2004,7 @@ tasks:
   - command: shell.exec
     params:
       shell: bash
+      silent: true
       script: |
         set -oe
         echo "${release_tools_container_registry_password}" | podman login --password-stdin --username ${release_tools_container_registry_username} ${release_tools_container_registry}
@@ -2227,6 +2196,7 @@ task_groups:
   name: compile_upload_benchmarks_TG
   tasks:
   - compile_upload_benchmarks
+  - compile_upload_benchmarks_debug
 
 - <<: *compile_task_group_template
   name: compile_and_archive_dist_test_TG
@@ -2318,12 +2288,9 @@ task_groups:
   - compile_dist_test
   - archive_dist_test
   - archive_dist_test_debug
-  - compile_unittests
-  - run_unittests
   - compile_dbtest
   - run_dbtest
   - archive_dbtest
-  - compile_all
 
 - <<: *compile_task_group_template
   name: compile_test_serial_future_git_tag_multiversion_TG
@@ -2344,12 +2311,9 @@ task_groups:
   - compile_dist_test
   - archive_dist_test
   - archive_dist_test_debug
-  - compile_unittests
-  - run_unittests
   - compile_dbtest
   - run_dbtest
   - archive_dbtest
-  - compile_all
   - package
 
 # The *no_unittests_TG taskgroups are useful for static builds,
@@ -2404,28 +2368,11 @@ task_groups:
   - compile_dist_test
   - archive_dist_test
   - archive_dist_test_debug
-  - compile_unittests
-  - run_unittests
   - compile_dbtest
   - run_dbtest
   - archive_dbtest
   - compile_upload_benchmarks
-  - compile_all
-
-- <<: *compile_task_group_template
-  name: compile_test_benchmark_and_package_serial_TG
-  tasks:
-  - compile_dist_test
-  - archive_dist_test
-  - archive_dist_test_debug
-  - compile_unittests
-  - run_unittests
-  - compile_dbtest
-  - run_dbtest
-  - archive_dbtest
-  - compile_upload_benchmarks
-  - compile_all
-  - package
+  - compile_upload_benchmarks_debug
 
 # The *no_unittests_TG taskgroups are useful for static builds,
 # were the static binaries of the unittests can take up to
@@ -2440,18 +2387,18 @@ task_groups:
   - run_dbtest
   - archive_dbtest
   - compile_upload_benchmarks
+  - compile_upload_benchmarks_debug
   - compile_all_but_not_unittests
   - package
 
 - <<: *compile_task_group_template
-  name: compile_and_test_TG
+  name: compile_test_parallel_unittest_stream_TG
+  max_hosts: -1
   tasks:
-  - compile_dist_test
-  - compile_unittests
-  - run_unittests
-  - compile_dbtest
-  - run_dbtest
-  - compile_all
+  - compile_and_run_unittests_first_quarter
+  - compile_and_run_unittests_second_quarter
+  - compile_and_run_unittests_third_quarter
+  - compile_and_run_unittests_fourth_quarter
 
 # These `parallel` task groups are only appropriate for builders that
 # use --link-model=dynamic, and have scons_cache_scope: shared and
@@ -2469,29 +2416,7 @@ task_groups:
   - determine_patch_tests
   - archive_dist_test
   - archive_dist_test_debug
-  - compile_all
-
-- <<: *compile_task_group_template
-  name: compile_test_and_package_parallel_core_stream_TG
-  tasks:
-  - compile_dist_test
-  - determine_patch_tests
-  - archive_dist_test
-  - archive_dist_test_debug
-  - compile_all
-  - package
-
-- <<: *compile_task_group_template
-  name: compile_test_parallel_unittest_stream_TG
-  tasks:
-  - compile_unittests
-  - run_unittests
-
-#- <<: *compile_task_group_template
-#  name: compile_test_parallel_unittest_stream_with_recording_TG
-#  tasks:
-#    - compile_unittests_for_recorded_unittest
-#    - run_unittests_with_recording
+  - compile_all_but_not_unittests
 
 - <<: *compile_task_group_template
   name: compile_test_parallel_dbtest_stream_TG

etc/evergreen_yml_components/tasks/misc_tasks.yml

@@ -928,7 +928,7 @@ tasks:
   - func: "run selinux tests"
     vars:
       user: root
-      distro: rhel76-selinux
+      distro: rhel79-selinux
       test_list: jstests/selinux/*.js src/mongo/db/modules/enterprise/jstests/selinux/*.js
 
 - name: selinux_rhel7_org
@@ -947,7 +947,7 @@ tasks:
   - func: "run selinux tests"
     vars:
       user: root
-      distro: rhel76-selinux
+      distro: rhel79-selinux
       test_list: jstests/selinux/*.js
 
 - name: selinux_rhel8_enterprise

etc/evergreen_yml_components/tasks/resmoke/server_divisions/clusters_and_integrations/tasks.yml

@@ -1109,7 +1109,6 @@ tasks:
       sharded_collections_jscore_passthrough_last_lts_new_old_old_new: last_lts
   - func: "generate resmoke tasks"
     vars:
-      suite: sharded_collections_jscore_passthrough
       run_no_feature_flag_tests: "true"
 
 - <<: *gen_task_template
@@ -1234,7 +1233,6 @@ tasks:
       sharding_jscore_passthrough_last_continuous_new_old_old_new: last_continuous
   - func: "generate resmoke tasks"
     vars:
-      suite: sharding_jscore_passthrough
       run_no_feature_flag_tests: "true"
 
 - <<: *gen_task_template
@@ -1289,7 +1287,6 @@ tasks:
   - func: "generate resmoke tasks"
     vars:
       use_large_distro: "true"
-      suite: sharding
       run_no_feature_flag_tests: "true"
 
 - <<: *jstestfuzz_template
@@ -1626,7 +1623,6 @@ tasks:
       <<: *jstestfuzz_config_vars
       jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
-      suite: jstestfuzz_sharded
       npm_command: jstestfuzz
       run_no_feature_flag_tests: "true"
 

etc/evergreen_yml_components/tasks/resmoke/server_divisions/durable_transactions_and_availability/tasks.yml

@@ -289,7 +289,6 @@ tasks:
       concurrency_replication_last_lts_old_new_new: last_lts
   - func: "generate resmoke tasks"
     vars:
-      suite: concurrency_replication
       run_no_feature_flag_tests: "true"
 
 - <<: *gen_task_template
@@ -365,7 +364,6 @@ tasks:
       concurrency_sharded_replication_last_lts_new_old_old_new: last_lts
   - func: "generate resmoke tasks"
     vars:
-      suite: concurrency_sharded_replication
       run_no_feature_flag_tests: "true"
 
 - <<: *gen_task_template
@@ -456,7 +454,6 @@ tasks:
       num_tasks: 5
       jstestfuzz_vars: --useEsModules
       npm_command: initsync-fuzzer
-      suite: initial_sync_fuzzer
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
       run_no_feature_flag_tests: "true"
 
@@ -609,7 +606,6 @@ tasks:
       <<: *jstestfuzz_config_vars
       jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
-      suite: jstestfuzz_replication
       npm_command: jstestfuzz
       run_no_feature_flag_tests: "true"
 
@@ -709,7 +705,6 @@ tasks:
       replica_sets_jscore_passthrough_last_lts_old_new_new: last_lts
   - func: "generate resmoke tasks"
     vars:
-      suite: replica_sets_jscore_passthrough
       run_no_feature_flag_tests: "true"
 
 - <<: *gen_task_template
@@ -790,7 +785,6 @@ tasks:
       replica_sets_last_continuous: last_continuous
   - func: "generate resmoke tasks"
     vars:
-      suite: replica_sets
       run_no_feature_flag_tests: "true"
 
 - <<: *gen_task_template
@@ -822,7 +816,7 @@ tasks:
 
 - <<: *gen_task_template
   name: replica_sets_uninitialized_fcv_jscore_passthrough_gen
-  tags: ["assigned_to_jira_team_server_repl", "replica_sets", "san", "large"]
+  tags: ["assigned_to_jira_team_server_repl", "replica_sets", "san", "large", "uninitialized_fcv"]
   commands:
   - func: "generate resmoke tasks"
 
@@ -893,7 +887,6 @@ tasks:
       num_tasks: 5
       jstestfuzz_vars: --useEsModules
       npm_command: rollback-fuzzer
-      suite: rollback_fuzzer
       # Rollback suites create indexes with majority of nodes not available for replication. So, disabling
       # index build commit quorum.
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}, enableIndexBuildCommitQuorum: false}'"
@@ -924,9 +917,19 @@ tasks:
 
 - <<: *gen_task_template
   name: sharded_collections_uninitialized_fcv_jscore_passthrough_gen
-  tags: ["assigned_to_jira_team_server_repl", "sharding", "jscore", "initsync"]
+  tags: ["assigned_to_jira_team_server_repl", "sharding", "jscore", "initsync", "uninitialized_fcv"]
   commands:
   - func: "generate resmoke tasks"
+    vars:
+      use_large_distro: "true"
+
+- <<: *gen_task_template
+  name: sharded_collections_txns_uninitialized_fcv_jscore_passthrough_gen
+  tags: ["assigned_to_jira_team_server_repl", "sharding", "jscore", "initsync", "uninitialized_fcv"]
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      use_large_distro: "true"
 
 - <<: *gen_task_template
   name: sharding_api_version_jscore_passthrough_gen
@@ -938,9 +941,19 @@ tasks:
 
 - <<: *gen_task_template
   name: sharding_uninitialized_fcv_jscore_passthrough_gen
-  tags: ["assigned_to_jira_team_server_repl", "sharding", "jscore", "common", "initsync"]
+  tags: ["assigned_to_jira_team_server_repl", "sharding", "jscore", "initsync", "uninitialized_fcv"]
   commands:
   - func: "generate resmoke tasks"
+    vars:
+      use_large_distro: "true"
+
+- <<: *gen_task_template
+  name: sharding_txns_uninitialized_fcv_jscore_passthrough_gen
+  tags: ["assigned_to_jira_team_server_repl", "sharding", "jscore", "initsync", "uninitialized_fcv"]
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      use_large_distro: "true"
 
 - name: tla_plus
   tags: ["assigned_to_jira_team_server_repl"]

etc/evergreen_yml_components/tasks/resmoke/server_divisions/query/tasks.yml

@@ -247,13 +247,13 @@ tasks:
     vars:
       <<: *jstestfuzz_config_vars
       # We have seen some common scenarios where the generated pipelines take a while to run and can
-      # hit some timeouts. We'll split 80000 pipelines across 80 files, compared to 80000 pipelines
+      # hit some timeouts. We'll split 70000 pipelines across 70 files, compared to 80000 pipelines
       # across 20 files in the other generational agg fuzzers. This approach can be considered if we
       # see similar timeouts elsewhere. It is not well understood whether/how we could pass
       # 'numPipelines' as an argument in the yaml here, but it works as part of the
       # 'jstestfuzz_vars' argument string. If a future reader better understands this evergreen
       # integration, please update this comment and/or move numPipelines to a yaml arg here.
-      num_files: 80
+      num_files: 70
       num_tasks: 20
       jstestfuzz_vars: --diffTestingMode timeseries --numPipelines=1000
       npm_command: agg-fuzzer
@@ -263,7 +263,8 @@ tasks:
 ## Standalone fuzzer for checking wildcard index correctness ##
 - <<: *jstestfuzz_template
   name: aggregation_wildcard_fuzzer_gen
-  tags: ["assigned_to_jira_team_server_query_execution", "aggfuzzer", "common", "wildcard", "require_npm", "random_name"]
+  # TODO SERVER-85881: Re-enable wildcard fuzzers on debug builds by removing "no_debug_mode" tag.
+  tags: ["assigned_to_jira_team_server_query_execution", "aggfuzzer", "common", "wildcard", "require_npm", "random_name", "no_debug_mode"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -382,7 +383,6 @@ tasks:
       change_streams_last_lts_old_new_new: last_lts
   - func: "generate resmoke tasks"
     vars:
-      suite: change_streams
       run_no_feature_flag_tests: "true"
 
 - <<: *task_template
@@ -411,7 +411,6 @@ tasks:
       change_streams_sharded_collections_passthrough_last_lts_new_old_old_new: last_lts
   - func: "generate resmoke tasks"
     vars:
-      suite: change_streams_sharded_collections_passthrough
       run_no_feature_flag_tests: "true"
 
 - <<: *task_template
@@ -564,8 +563,8 @@ tasks:
   - func: "generate resmoke tasks"
     vars:
       <<: *jstestfuzz_config_vars
-      num_files: 20
-      num_tasks: 20
+      num_files: 10
+      num_tasks: 40
       jstestfuzz_vars: --useEsModules
       npm_command: update-fuzzer
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
@@ -583,8 +582,8 @@ tasks:
   - func: "generate resmoke tasks"
     vars:
       <<: *jstestfuzz_config_vars
-      num_files: 20
-      num_tasks: 20
+      num_files: 10
+      num_tasks: 40
       jstestfuzz_vars: --useEsModules
       npm_command: update-fuzzer
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
@@ -598,8 +597,8 @@ tasks:
   - func: "generate resmoke tasks"
     vars:
       <<: *jstestfuzz_config_vars
-      num_files: 20
-      num_tasks: 20
+      num_files: 10
+      num_tasks: 40
       jstestfuzz_vars: --diffTestingMode timeseries --useEsModules
       npm_command: update-fuzzer
       suite: generational_fuzzer

etc/evergreen_yml_components/variants/amazon/test_dev.yml

@@ -8,7 +8,7 @@ variables:
 # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
 - &linux-arm64-dynamic-compile-params  # Essential set of compile parameters used for Linux dev variants.
   run_on:
-  - amazon2-arm64-large
+  - amazon2-arm64-latest-large
   activate: true  # These compile variants run on every commit to reduce latency of the auto-reverter.
   modules:
     - enterprise
@@ -42,9 +42,32 @@ variables:
   packager_arch: aarch64
   packager_distro: amazon2
   repo_edition: enterprise
-  large_distro_name: amazon2-arm64-large
+  large_distro_name: amazon2-arm64-latest-large
   num_scons_link_jobs_available: 0.99
 
+# THIS HAS COPIES IN:
+# - etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml
+# - etc/evergreen_yml_components/variants/amazon/test_dev.yml
+# ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
+- &amazon_linux2_arm64_dynamic_compile_variant_dependency
+  depends_on:
+  - name: archive_dist_test_debug
+    variant: &amazon_linux2_arm64_dynamic_compile_variant_name amazon-linux2-arm64-dynamic-compile
+  - name: version_gen
+    variant: generate-tasks-for-version
+    # This is added because of EVG-18211.
+    # Without this we are adding extra dependencies on evergreen and it is causing strain
+    omit_generated_tasks: true
+  # - name: generate_buildid_to_debug_symbols_mapping
+  #   variant: amazon-linux2-arm64-dynamic-compile
+
+# THIS HAS COPIES IN:
+# - etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml
+# - etc/evergreen_yml_components/variants/amazon/test_dev.yml
+# ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
+- &amazon_linux2_arm64_dynamic_expansions
+  <<: *linux_arm64_generic_expansions
+  compile_variant: *amazon_linux2_arm64_dynamic_compile_variant_name
 
 buildvariants:
 - <<: *linux-arm64-dynamic-compile-params
@@ -67,7 +90,7 @@ buildvariants:
   tasks:
     - name: clang_tidy_TG
       distros:
-        - amazon2-arm64-xlarge
+        - amazon2-arm64-latest-xlarge
     - name: compile_ninja_quick_TG
     - name: compile_test_parallel_unittest_stream_TG
     - name: compile_test_parallel_core_stream_TG
@@ -87,7 +110,7 @@ buildvariants:
   modules:
     - enterprise
   run_on:
-    - amazon2-arm64-small
+    - amazon2-arm64-latest-small
   stepback: false
   expansions:
     <<: *linux_arm64_generic_expansions
@@ -123,7 +146,7 @@ buildvariants:
     - amazon2-arm64-xlarge-commitqueue
   - name: jsCore
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: .lint
   - name: test_api_version_compatibility
   - name: validate_commit_message
@@ -133,3 +156,59 @@ buildvariants:
   - name: version_gen_validation
     distros:
     - ubuntu2004-small
+
+- <<: *amazon_linux2_arm64_dynamic_compile_variant_dependency
+  name: amazon-linux2-arm64-try-sbe-engine
+  display_name: "Amazon Linux 2 arm64 Enterprise Query Patch Only (trySbeEngine)"
+  cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history.
+  run_on:
+  - amazon2-arm64-latest-small
+  stepback: true
+  expansions:
+    <<: *amazon_linux2_arm64_dynamic_expansions
+    # Diagnostic latches are disabled by default, and we match that behavior here. We also need to
+    # exclude tests with 'requires_latch_analyzer'.
+    compile_flags: >-
+      --use-diagnostic-latches=off
+    scons_cache_scope: shared
+    scons_cache_mode: all
+    has_packages: false
+    jstestfuzz_num_generated_files: 20
+    jstestfuzz_concurrent_num_files: 5
+    target_resmoke_time: 30
+    max_sub_suites: 3
+    idle_timeout_factor: 1.5
+    exec_timeout_factor: 1.5
+    test_flags: >-
+      --mongodSetParameters="{internalQueryFrameworkControl: trySbeEngine}"
+      --excludeWithAnyTags=resource_intensive,requires_latch_analyzer
+  tasks:
+  - name: aggregation_mongos_passthrough
+  - name: aggregation_sharded_collections_passthrough
+  - name: aggregation_one_shard_sharded_collections
+  - name: aggregation
+  - name: aggregation_disabled_optimization
+  - name: noPassthrough_gen
+  - name: noPassthroughWithMongod_gen
+  - name: jsCore
+    distros:
+    - amazon2-arm64-latest-large
+  - name: replica_sets_jscore_passthrough_gen
+  - name: sharded_collections_jscore_passthrough_gen
+  - name: sharding_jscore_passthrough_gen
+  - name: fcv_upgrade_downgrade_replica_sets_jscore_passthrough_gen
+  - name: fcv_upgrade_downgrade_sharding_jscore_passthrough_gen
+  - name: fcv_upgrade_downgrade_sharded_collections_jscore_passthrough_gen
+  - name: aggregation_repeat_queries
+  - name: burn_in_tests_gen
+    depends_on:
+    - name: version_burn_in_gen
+      variant: generate-tasks-for-version
+      omit_generated_tasks: true
+    - name: archive_dist_test_debug
+      variant: *amazon_linux2_arm64_dynamic_compile_variant_name
+  - name: multiversion_gen
+  - name: .multiversion_sanity_check
+  - name: concurrency_gen
+  - name: concurrency_replication_gen
+  - name: concurrency_sharded_replication_gen

etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml

@@ -8,7 +8,7 @@ variables:
 # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
 - &linux-arm64-dynamic-compile-params  # Essential set of compile parameters used for Linux dev variants.
   run_on:
-  - amazon2-arm64-large
+  - amazon2-arm64-latest-large
   activate: true  # These compile variants run on every commit to reduce latency of the auto-reverter.
   modules:
     - enterprise
@@ -30,6 +30,10 @@ variables:
     --link-model=dynamic
     --use-diagnostic-latches=on
 
+# THIS HAS COPIES IN:
+# - etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml
+# - etc/evergreen_yml_components/variants/amazon/test_dev.yml
+# ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
 - &amazon_linux2_arm64_dynamic_compile_variant_dependency
   depends_on:
   - name: archive_dist_test_debug
@@ -54,9 +58,13 @@ variables:
   packager_arch: aarch64
   packager_distro: amazon2
   repo_edition: enterprise
-  large_distro_name: amazon2-arm64-large
+  large_distro_name: amazon2-arm64-latest-large
   num_scons_link_jobs_available: 0.99
 
+# THIS HAS COPIES IN:
+# - etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml
+# - etc/evergreen_yml_components/variants/amazon/test_dev.yml
+# ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
 - &amazon_linux2_arm64_dynamic_expansions
   <<: *linux_arm64_generic_expansions
   compile_variant: *amazon_linux2_arm64_dynamic_compile_variant_name
@@ -104,7 +112,7 @@ buildvariants:
   modules:
     - enterprise
   run_on:
-    - amazon2-arm64-small
+    - amazon2-arm64-latest-small
   stepback: true
   expansions: &enterprise-amazon-linux2-arm64-all-feature-flags-expansions
     <<: *amazon_linux2_arm64_dynamic_expansions
@@ -148,10 +156,10 @@ buildvariants:
   - name: .config_fuzzer !.large
   - name: .config_fuzzer .large
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: .config_fuzzer_stress
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: disk_wiredtiger
   - name: embedded_router_jscore_passthrough_gen
   - name: embedded_router_jscore_passthrough_with_config_shard_gen
@@ -201,7 +209,7 @@ buildvariants:
   - name: sharding_jscore_passthrough_with_replica_set_endpoint_gen
   - name: .serverless
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: .timeseries_crud
   - name: session_jscore_passthrough
   - name: .shard_split
@@ -242,7 +250,7 @@ buildvariants:
   modules:
     - enterprise
   run_on:
-    - amazon2-arm64-small
+    - amazon2-arm64-latest-small
   expansions:
     <<: *amazon_linux2_arm64_dynamic_expansions
     test_flags: >-
@@ -283,10 +291,10 @@ buildvariants:
   - name: .config_fuzzer !.large
   - name: .config_fuzzer .large
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: .config_fuzzer_stress
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: disk_wiredtiger
   - name: .encrypt
   - name: feature_flag_multiversion_gen
@@ -325,7 +333,7 @@ buildvariants:
   - name: secondary_reads_passthrough_gen
   - name: .serverless
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: .timeseries_crud
   - name: session_jscore_passthrough
   - name: .shard_split

etc/evergreen_yml_components/variants/amazon/test_release.yml

@@ -6,7 +6,7 @@ buildvariants:
   display_name: Amazon Linux 2
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   run_on:
-  - amazon2-test
+  - amazon2-latest-small
   expansions:
     test_flags: >-
       --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,requires_external_data_source,requires_latch_analyzer
@@ -27,12 +27,12 @@ buildvariants:
     packager_distro: amazon2
     repo_edition: org
     scons_cache_scope: shared
-    large_distro_name: amazon2-large
+    large_distro_name: amazon2-latest-large
     compile_variant: amazon2
   tasks:
   - name: compile_test_and_package_serial_no_unittests_TG
     distros:
-    - amazon2-build
+    - amazon2-latest-large
   - name: .aggfuzzer .common !.feature_flag_guarded
   - name: aggregation !.feature_flag_guarded
   - name: .auth !.audit !.multiversion
@@ -67,7 +67,7 @@ buildvariants:
   modules:
   - enterprise
   run_on:
-  - amazon2-test
+  - amazon2-latest-small
   expansions:
     additional_package_targets: >-
       archive-mongocryptd
@@ -99,7 +99,7 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_no_unittests_TG
     distros:
-    - amazon2-build
+    - amazon2-latest-large
   - name: .aggfuzzer .common !.feature_flag_guarded
   - name: aggregation !.feature_flag_guarded
   - name: audit
@@ -131,7 +131,7 @@ buildvariants:
   display_name: "Amazon Linux 2 (openssl 1.1.1)"
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   run_on:
-  - amazon2-openssl111-small
+  - amazon2-openssl111-latest-small
   expansions:
     test_flags: >-
       --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,requires_external_data_source,requires_latch_analyzer
@@ -153,12 +153,12 @@ buildvariants:
     packager_distro: amazon2
     repo_edition: org
     scons_cache_scope: shared
-    large_distro_name: amazon2-openssl111-large
+    large_distro_name: amazon2-openssl111-latest-large
     compile_variant: amazon2-openssl111
   tasks:
   - name: compile_test_and_package_serial_no_unittests_TG
     distros:
-    - amazon2-openssl111-large
+    - amazon2-openssl111-latest-large
   - name: .aggfuzzer .common !.feature_flag_guarded
   - name: aggregation !.feature_flag_guarded
   - name: .auth !.audit !.multiversion
@@ -192,7 +192,7 @@ buildvariants:
   modules:
   - enterprise
   run_on:
-  - amazon2-openssl111-small
+  - amazon2-openssl111-latest-small
   expansions:
     additional_package_targets: >-
       archive-mongocryptd
@@ -225,7 +225,7 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_no_unittests_TG
     distros:
-    - amazon2-openssl111-large
+    - amazon2-openssl111-latest-large
   - name: .aggfuzzer .common !.feature_flag_guarded
   - name: aggregation !.feature_flag_guarded
   - name: audit
@@ -256,7 +256,7 @@ buildvariants:
   display_name: Amazon Linux 2 arm64
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   run_on:
-  - amazon2-arm64-small
+  - amazon2-arm64-latest-small
   expansions:
     push_path: linux
     push_bucket: downloads.mongodb.org
@@ -274,12 +274,12 @@ buildvariants:
     packager_distro: amazon2
     repo_edition: org
     scons_cache_scope: shared
-    large_distro_name: amazon2-arm64-large
+    large_distro_name: amazon2-arm64-latest-large
     compile_variant: amazon2-arm64
   tasks:
   - name: compile_test_and_package_serial_no_unittests_TG
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: aggregation !.feature_flag_guarded
   - name: .auth !.audit !.multiversion
   - name: sharding_auth_gen
@@ -287,7 +287,7 @@ buildvariants:
   - name: .misc_js
   - name: .concurrency .common
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: concurrency_replication_causal_consistency_gen
   - name: disk_wiredtiger
   - name: .jscore .common
@@ -312,7 +312,7 @@ buildvariants:
   modules:
   - enterprise
   run_on:
-  - amazon2-arm64-small
+  - amazon2-arm64-latest-small
   expansions:
     additional_package_targets: >-
       archive-mongocryptd
@@ -344,10 +344,10 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_no_unittests_TG
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: compile_integration_and_test_parallel_stream_TG
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: test_api_version_compatibility
   - name: .aggfuzzer !.feature_flag_guarded
   - name: .aggregation !.feature_flag_guarded
@@ -360,18 +360,18 @@ buildvariants:
   - name: .concurrency !.large !.no_txns
   - name: .concurrency .large !.no_txns
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: .config_fuzzer !.large
   - name: .config_fuzzer .large
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: disk_wiredtiger
   - name: .encrypt
   - name: idl_tests
   - name: initial_sync_fuzzer_gen
   - name: jsCore
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: .jscore .common !jsCore !.feature_flag_guarded
   - name: jsCore_min_batch_repeat_queries_ese_gsm
   - name: jsCore_txns_large_txns_format
@@ -383,17 +383,17 @@ buildvariants:
   - name: .query_fuzzer !.feature_flag_guarded
   - name: .read_write_concern .large
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: .read_write_concern !.large
   - name: .replica_sets !.encrypt !.auth
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: replica_sets_api_version_jscore_passthrough_gen
   - name: replica_sets_reconfig_jscore_passthrough_gen
   - name: retryable_writes_jscore_passthrough_gen
   - name: retryable_writes_jscore_stepdown_passthrough_gen
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: .read_only
   - name: .rollbackfuzzer
   - name: sasl
@@ -409,16 +409,16 @@ buildvariants:
   - name: .stitch
   - name: .crypt
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: .publish_crypt
   - name: secondary_reads_passthrough_gen
   - name: server_discovery_and_monitoring_json_test_TG
   - name: .serverless
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: server_selection_json_test_TG
     distros:
-    - amazon2-arm64-large
+    - amazon2-arm64-latest-large
   - name: test_packages
     distros:
     - ubuntu1804-arm64-build
@@ -432,7 +432,7 @@ buildvariants:
   display_name: Amazon Linux 2 arm64 (openssl 1.1.1)
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   run_on:
-  - amazon2-arm64-openssl111-small
+  - amazon2-arm64-openssl111-latest-small
   expansions:
     push_path: linux
     push_bucket: downloads.mongodb.org
@@ -451,12 +451,12 @@ buildvariants:
     packager_distro: amazon2
     repo_edition: org
     scons_cache_scope: shared
-    large_distro_name: amazon2-arm64-openssl111-large
+    large_distro_name: amazon2-arm64-openssl111-latest-large
     compile_variant: amazon2-arm64-openssl111
   tasks:
   - name: compile_test_and_package_serial_no_unittests_TG
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: aggregation !.feature_flag_guarded
   - name: .auth !.audit !.multiversion
   - name: sharding_auth_gen
@@ -464,7 +464,7 @@ buildvariants:
   - name: .misc_js
   - name: .concurrency .common
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: concurrency_replication_causal_consistency_gen
   - name: disk_wiredtiger
   - name: .jscore .common
@@ -488,7 +488,7 @@ buildvariants:
   modules:
   - enterprise
   run_on:
-  - amazon2-arm64-openssl111-small
+  - amazon2-arm64-openssl111-latest-small
   expansions:
     additional_package_targets: >-
       archive-mongocryptd
@@ -521,10 +521,10 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_no_unittests_TG
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: compile_integration_and_test_parallel_stream_TG
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: test_api_version_compatibility
   - name: .aggfuzzer !.feature_flag_guarded
   - name: .aggregation !.feature_flag_guarded
@@ -537,18 +537,18 @@ buildvariants:
   - name: .concurrency !.large !.no_txns
   - name: .concurrency .large !.no_txns
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: .config_fuzzer !.large
   - name: .config_fuzzer .large
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: disk_wiredtiger
   - name: .encrypt
   - name: idl_tests
   - name: initial_sync_fuzzer_gen
   - name: jsCore
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: .jscore .common !jsCore !.feature_flag_guarded
   - name: jsCore_min_batch_repeat_queries_ese_gsm
   - name: jsCore_txns_large_txns_format
@@ -560,17 +560,17 @@ buildvariants:
   - name: .query_fuzzer !.feature_flag_guarded
   - name: .read_write_concern .large
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: .read_write_concern !.large
   - name: .replica_sets !.encrypt !.auth
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: replica_sets_api_version_jscore_passthrough_gen
   - name: replica_sets_reconfig_jscore_passthrough_gen
   - name: retryable_writes_jscore_passthrough_gen
   - name: retryable_writes_jscore_stepdown_passthrough_gen
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: .read_only
   - name: .rollbackfuzzer
   - name: sasl
@@ -586,16 +586,16 @@ buildvariants:
   - name: .stitch
   - name: .crypt
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: .publish_crypt
   - name: secondary_reads_passthrough_gen
   - name: server_discovery_and_monitoring_json_test_TG
   - name: .serverless
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: server_selection_json_test_TG
     distros:
-    - amazon2-arm64-openssl111-large
+    - amazon2-arm64-openssl111-latest-large
   - name: test_packages
     distros:
     - ubuntu1804-arm64-build
@@ -771,113 +771,6 @@ buildvariants:
   - name: .publish
   - name: generate_buildid_to_debug_symbols_mapping
 
-# This variant is a special variant to test LTO.
-# We just want it to bake for a while before considering that we turn it on by default.
-- name: enterprise-amazon2023-lto
-  display_name: "Enterprise Amazon Linux 2023 LTO"
-  cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
-  modules:
-  - enterprise
-  run_on:
-  - amazon2023.0-small
-  expansions:
-    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
-    compile_flags: >-
-      --ssl
-      MONGO_DISTMOD=amazon2023
-      -j$(grep -c ^processor /proc/cpuinfo)
-      --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
-      --lto
-      --linker=gold
-      --link-model=object
-    crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique"
-    # TODO BUILD-13887 should fix uses_pykmip incompatibility.
-    test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool,uses_pykmip,requires_v4_0,requires_external_data_source,requires_latch_analyzer
-    has_packages: true
-    multiversion_platform: amazon2023
-    multiversion_edition: enterprise
-    multiversion_architecture: x86_64
-    repo_edition: enterprise
-    scons_cache_scope: shared
-    compile_variant: enterprise-amazon2023-lto
-    large_distro_name: amazon2023.0-large
-  tasks:
-  - name: compile_test_and_package_serial_lto_no_unittests_TG
-    distros:
-    - amazon2023.0-large
-  - name: test_api_version_compatibility
-  - name: .aggfuzzer !.feature_flag_guarded !.multiversion
-  - name: .aggregation !.feature_flag_guarded
-  - name: audit
-  - name: .auth !.multiversion
-  - name: .causally_consistent !.sharding
-  - name: .change_streams
-  - name: .change_stream_fuzzer
-  - name: .misc_js
-  - name: .concurrency !.large !.no_txns
-  - name: .concurrency .large !.no_txns
-    distros:
-    - amazon2023.0-large
-  - name: config_fuzzer_concurrency
-  - name: config_fuzzer_jsCore
-  - name: disk_wiredtiger
-  - name: .encrypt
-  - name: idl_tests
-  - name: initial_sync_fuzzer_gen
-  - name: jsCore
-    distros:
-    - amazon2023.0-large
-  - name: .jscore .common !jsCore !.feature_flag_guarded
-  - name: jsCore_txns_large_txns_format
-  - name: json_schema
-  - name: .jstestfuzz !.flow_control  # Flow control jstestfuzz take longer.
-  - name: libunwind_tests
-  - name: .multi_shard
-  - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
-  - name: .query_fuzzer !.feature_flag_guarded
-  - name: .read_write_concern .large
-    distros:
-    - amazon2023.0-large
-  - name: .read_write_concern !.large
-  - name: .replica_sets !.encrypt !.auth
-    distros:
-    - amazon2023.0-large
-  - name: replica_sets_api_version_jscore_passthrough_gen
-  - name: replica_sets_reconfig_jscore_passthrough_gen
-  - name: retryable_writes_jscore_passthrough_gen
-  - name: retryable_writes_jscore_stepdown_passthrough_gen
-    distros:
-    - amazon2023.0-large
-  - name: .read_only
-  - name: .rollbackfuzzer
-  - name: sasl
-  - name: search
-  - name: search_auth
-  - name: search_pinned_connections_auth
-  - name: search_ssl
-  - name: session_jscore_passthrough
-  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: sharding_api_version_jscore_passthrough_gen
-  - name: .sharding .txns
-  - name: .sharding .common !.multiversion
-  # TODO: SERVER-79886 Fix broken .crypt task
-  # - name: .crypt
-  #   distros:
-  #   - amazon2023.0-large
-  - name: secondary_reads_passthrough_gen
-  - name: server_discovery_and_monitoring_json_test_TG
-  - name: .serverless
-    distros:
-    - amazon2023.0-large
-  - name: server_selection_json_test_TG
-    distros:
-    - amazon2023.0-large
-  # TODO: SERVER-79886 Fix broken test_packages task
-  # - name: test_packages
-  #   distros:
-  #   - amazon2023.0-large
-  - name: generate_buildid_to_debug_symbols_mapping
-
 
 - name: amazon2023-arm64
   display_name: Amazon Linux 2023 arm64
@@ -1051,129 +944,16 @@ buildvariants:
   - name: .publish
   - name: generate_buildid_to_debug_symbols_mapping
 
-# This variant is a special variant to test LTO.
-# We just want it to bake for a while before considering that we turn it on by default.
-- name: enterprise-amazon2023-arm64-lto
-  display_name: "Enterprise Amazon Linux 2023 arm64 LTO"
-  cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
-  modules:
-  - enterprise
-  run_on:
-  - amazon2023.0-arm64-small
-  expansions:
-    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
-    compile_flags: >-
-      --ssl
-      MONGO_DISTMOD=amazon2023
-      -j$(grep -c ^processor /proc/cpuinfo)
-      --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
-      --lto
-      --linker=gold
-      --link-model=object
-    crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique"
-    # TODO BUILD-13887 should fix uses_pykmip incompatibility.
-    test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool,uses_pykmip,requires_v4_0,requires_external_data_source,requires_latch_analyzer
-    has_packages: true
-    multiversion_platform: amazon2023
-    multiversion_edition: enterprise
-    multiversion_architecture: aarch64
-    packager_script: packager_enterprise.py
-    packager_arch: aarch64
-    packager_distro: amazon2023
-    repo_edition: enterprise
-    scons_cache_scope: shared
-    compile_variant: enterprise-amazon2023-arm64-lto
-    large_distro_name: amazon2023.0-arm64-large
-  tasks:
-  - name: compile_test_and_package_serial_lto_no_unittests_TG
-    distros:
-    - amazon2023.0-arm64-large
-  - name: test_api_version_compatibility
-  - name: .aggfuzzer !.feature_flag_guarded !.multiversion
-  - name: .aggregation !.feature_flag_guarded
-  - name: audit
-  - name: .auth !.multiversion
-  - name: .causally_consistent !.sharding
-  - name: .change_streams
-  - name: .change_stream_fuzzer
-  - name: .misc_js
-  - name: .concurrency !.large !.no_txns
-  - name: .concurrency .large !.no_txns
-    distros:
-    - amazon2023.0-arm64-large
-  - name: .config_fuzzer !.large
-  - name: .config_fuzzer .large
-    distros:
-    - amazon2023.0-arm64-large
-  - name: disk_wiredtiger
-  - name: .encrypt
-  - name: idl_tests
-  - name: initial_sync_fuzzer_gen
-  - name: jsCore
-    distros:
-    - amazon2023.0-arm64-large
-  - name: .jscore .common !jsCore !.feature_flag_guarded
-  - name: jsCore_min_batch_repeat_queries_ese_gsm
-  - name: jsCore_txns_large_txns_format
-  - name: json_schema
-  - name: .jstestfuzz !.flow_control  # Flow control jstestfuzz take longer.
-  - name: libunwind_tests
-  - name: .multi_shard
-  - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
-  - name: .query_fuzzer !.feature_flag_guarded
-  - name: .read_write_concern .large
-    distros:
-    - amazon2023.0-arm64-large
-  - name: .read_write_concern !.large
-  - name: .replica_sets !.encrypt !.auth
-    distros:
-    - amazon2023.0-arm64-large
-  - name: replica_sets_api_version_jscore_passthrough_gen
-  - name: replica_sets_reconfig_jscore_passthrough_gen
-  - name: retryable_writes_jscore_passthrough_gen
-  - name: retryable_writes_jscore_stepdown_passthrough_gen
-    distros:
-    - amazon2023.0-arm64-large
-  - name: .read_only
-  - name: .rollbackfuzzer
-  - name: sasl
-  - name: search
-  - name: search_auth
-  - name: search_pinned_connections_auth
-  - name: search_ssl
-  - name: session_jscore_passthrough
-  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: sharding_api_version_jscore_passthrough_gen
-  - name: .sharding .txns
-  - name: .sharding .common !.multiversion
-  # TODO: SERVER-79886 Fix broken .crypt task
-  # - name: .crypt
-  #   distros:
-  #   - amazon2023.0-arm64-large
-  - name: secondary_reads_passthrough_gen
-  - name: server_discovery_and_monitoring_json_test_TG
-  - name: .serverless
-    distros:
-    - amazon2023.0-arm64-large
-  - name: server_selection_json_test_TG
-    distros:
-    - amazon2023.0-arm64-large
-  # TODO: SERVER-79886 Fix broken test_packages task
-  # - name: test_packages
-  #   distros:
-  #   - ubuntu2204-arm64-large
-  - name: generate_buildid_to_debug_symbols_mapping
-
 - name: enterprise-amazon2-streams
   display_name: "Amazon Linux 2 enterprise build with streams"
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   modules:
   - enterprise
   run_on:
-  - amazon2-test
+  - amazon2-latest-small
   expansions:
     test_flags: >-
-      --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,uses_pykmip,requires_external_data_source
+      --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,uses_pykmip,requires_external_data_source,requires_latch_analyzer
     push_path: linux
     push_bucket: downloads.10gen.com
     push_name: linux
@@ -1196,7 +976,7 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_no_unittests_TG
     distros:
-    - amazon2-build
+    - amazon2-latest-large
   - name: .publish
   - name: generate_buildid_to_debug_symbols_mapping
   - name: streams

etc/evergreen_yml_components/variants/debian/test_release.yml

@@ -2,30 +2,6 @@
 # rapid release (7.1, 7.2 etc.) and LTS release (7.0, 6.0 etc.) branch projects
 
 buildvariants:
-- name: enterprise-debian10-64
-  display_name: Jepsen Tests on Enterprise Debian 10
-  cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
-  modules:
-  - enterprise
-  run_on:
-  - debian10-test
-  expansions:
-    compile_flags: >-
-      --ssl
-      MONGO_DISTMOD=debian10
-      -j$(grep -c ^processor /proc/cpuinfo)
-      --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
-    scons_cache_scope: shared
-    large_distro_name: debian10-build
-    compile_variant: enterprise-debian10-64
-  tasks:
-  - name: compile_and_archive_dist_test_TG
-    distros:
-    - debian10-build
-  - name: .jepsen_docker
-    distros:
-    - debian10-large
-
 - name: debian11
   display_name: Debian 11
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
@@ -74,7 +50,8 @@ buildvariants:
   - name: .sharding .jscore !.wo_snapshot !.multi_stmt
   - name: .sharding .common !.csrs !.encrypt
   - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
-  - name: .ssl
+  # TODO SERVER-89541 Remove ocsp tag once oscrypto gets updated
+  - name: .ssl !.ocsp
   - name: .stitch
   - name: test_packages
     distros:
@@ -123,7 +100,8 @@ buildvariants:
   - name: .aggfuzzer .common !.feature_flag_guarded
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
-  - name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
+  # TODO SERVER-89541 Remove ocsp tag once oscrypto gets updated
+  - name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore !.ocsp
   - name: .jscore .common !.decimal !.sharding !.feature_flag_guarded
   - name: .jstestfuzz .common
   - name: replica_sets_auth_gen
@@ -186,7 +164,8 @@ buildvariants:
   - name: .sharding .jscore !.wo_snapshot !.multi_stmt
   - name: .sharding .common !.csrs !.encrypt !.multiversion
   - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
-  - name: .ssl
+  # TODO SERVER-89541 Remove ocsp tag once oscrypto gets updated
+  - name: .ssl !.ocsp
   - name: .stitch
   - name: test_packages
     distros:
@@ -235,7 +214,8 @@ buildvariants:
   - name: .aggfuzzer .common !.feature_flag_guarded !.multiversion
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
-  - name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
+    # TODO SERVER-89541 Remove ocsp tag once oscrypto gets updated
+  - name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore !.ocsp
   - name: .jscore .common !.decimal !.sharding !.feature_flag_guarded
   - name: .jstestfuzz .common
   - name: replica_sets_auth_gen

etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml

@@ -83,6 +83,9 @@ buildvariants:
   - name: compile_test_serial_TG
     distros:
     - rhel81-power8-large
+  - name: compile_test_parallel_unittest_stream_TG
+    distros:
+    - rhel81-power8-large
 
 - &enterprise-rhel-83-s390x-template
   name: enterprise-rhel-83-s390x
@@ -163,3 +166,6 @@ buildvariants:
   - name: compile_test_serial_TG
     distros:
     - rhel83-zseries-large
+  - name: compile_test_parallel_unittest_stream_TG
+    distros:
+    - rhel83-zseries-large

etc/evergreen_yml_components/variants/macos/test_dev_master_branch_only.yml

@@ -67,17 +67,17 @@ buildvariants:
       -j$(sysctl -n hw.logicalcpu)
       --libc++
       --variables-files=etc/scons/xcode_macosx_arm.vars
+      --use-diagnostic-latches=on
     resmoke_jobs_max: 6
     num_scons_link_jobs_available: 0.99
   tasks:
   - name: compile_test_serial_TG
+  - name: compile_test_parallel_unittest_stream_TG
   - name: audit
   - name: auth_audit_gen
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: .encrypt !.replica_sets !.sharding !.aggregation !.jscore
+  - name: fle
+  - name: fle2
   - name: .jscore .common !.decimal !.sharding
   - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough_gen
   - name: sasl
   - name: .crypt
-  - name: .timeseries_crud

etc/evergreen_yml_components/variants/macos/test_release.yml

@@ -23,36 +23,17 @@ buildvariants:
     compile_variant: macos
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: compile_build_tools_next_TG
-  - name: .aggregation !.auth !.encrypt !.unwind !.feature_flag_guarded
+  - name: compile_test_parallel_unittest_stream_TG
+  - name: aggregation
   - name: auth_gen
-  - name: .causally_consistent !.sharding
-  - name: .change_streams
+  - name: change_streams
   - name: .misc_js
-  - name: .concurrency !.no_txns !.kill_terminate !.cursor_sweeps
   - name: disk_wiredtiger
-  - name: initial_sync_fuzzer_gen
-  - name: .jscore .common !.auth !.feature_flag_guarded
-  - name: jsCore_txns_large_txns_format
-  - name: .jstestfuzz .causal
-  - name: .jstestfuzz .interrupt
-  - name: .jstestfuzz .common
-  - name: .jstestfuzz .session
-  - name: .query_fuzzer !.feature_flag_guarded
-  - name: .read_write_concern !.linearize
+  - name: .jscore .common !.auth !.sharding !.feature_flag_guarded
   - name: replica_sets_gen
-  - name: replica_sets_kill_secondaries_jscore_passthrough
-  - name: replica_sets_max_mirroring_large_txns_format_gen
   - name: .replica_sets .common !.auth
-  - name: retryable_writes_jscore_passthrough_gen
-  - name: .rollbackfuzzer
-  - name: session_jscore_passthrough
-  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: .sharding .txns
   - name: .ssl
-  - name: .stitch
   - name: push
-  - name: .timeseries_crud
 
 - name: macos-arm64
   display_name: macOS arm64
@@ -75,36 +56,17 @@ buildvariants:
     compile_variant: macos-arm64
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: compile_build_tools_next_TG
-  - name: .aggregation !.auth !.encrypt !.unwind !.feature_flag_guarded
+  - name: compile_test_parallel_unittest_stream_TG
+  - name: aggregation
   - name: auth_gen
-  - name: .causally_consistent !.sharding
-  - name: .change_streams
+  - name: change_streams
   - name: .misc_js
-  - name: .concurrency !.no_txns !.kill_terminate !.cursor_sweeps
   - name: disk_wiredtiger
-  - name: initial_sync_fuzzer_gen
-  - name: .jscore .common !.auth !.feature_flag_guarded
-  - name: jsCore_txns_large_txns_format
-  - name: .jstestfuzz .causal
-  - name: .jstestfuzz .interrupt
-  - name: .jstestfuzz .common
-  - name: .jstestfuzz .session
-  - name: .query_fuzzer !.feature_flag_guarded
-  - name: .read_write_concern !.linearize
+  - name: .jscore .common !.auth !.sharding !.feature_flag_guarded
   - name: replica_sets_gen
-  - name: replica_sets_kill_secondaries_jscore_passthrough
-  - name: replica_sets_max_mirroring_large_txns_format_gen
   - name: .replica_sets .common !.auth
-  - name: retryable_writes_jscore_passthrough_gen
-  - name: .rollbackfuzzer
-  - name: session_jscore_passthrough
-  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: .sharding .txns
   - name: .ssl
-  - name: .stitch
   - name: push
-  - name: .timeseries_crud
 
 - name: enterprise-macos
   display_name: Enterprise macOS
@@ -132,20 +94,16 @@ buildvariants:
     compile_variant: enterprise-macos
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: compile_build_tools_next_TG
+  - name: compile_test_parallel_unittest_stream_TG
   - name: audit
   - name: auth_audit_gen
-  - name: causally_consistent_jscore_txns_passthrough
   - name: .encrypt !.replica_sets !.sharding !.aggregation !.jscore
   - name: .jscore .common !.decimal !.sharding !.feature_flag_guarded
-  - name: .jstestfuzz .common
   - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough_gen
   - name: sasl
   - name: push
   - name: .crypt
   - name: .publish_crypt
-  - name: .timeseries_crud
 
 - name: enterprise-macos-arm64
   display_name: Enterprise macOS arm64
@@ -173,17 +131,13 @@ buildvariants:
     compile_variant: enterprise-macos-arm64
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: compile_build_tools_next_TG
+  - name: compile_test_parallel_unittest_stream_TG
   - name: audit
   - name: auth_audit_gen
-  - name: causally_consistent_jscore_txns_passthrough
   - name: .encrypt !.replica_sets !.sharding !.aggregation !.jscore
   - name: .jscore .common !.decimal !.sharding !.feature_flag_guarded
-  - name: .jstestfuzz .common
   - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough_gen
   - name: sasl
   - name: push
   - name: .crypt
   - name: .publish_crypt
-  - name: .timeseries_crud

etc/evergreen_yml_components/variants/misc/misc.yml

@@ -13,9 +13,7 @@ buildvariants:
     burn_in_tag_include_all_required_and_suggested: true
     burn_in_tag_exclude_build_variants: >-
       macos-debug-suggested
-    burn_in_tag_include_build_variants: >-
-      enterprise-rhel-80-64-bit-inmem
-      enterprise-rhel-80-64-bit-multiversion
+    burn_in_tag_include_build_variants:
     burn_in_tag_compile_task_dependency: archive_dist_test_debug
     compile_variant: &amazon_linux2_arm64_dynamic_compile_variant_name amazon-linux2-arm64-dynamic-compile
   depends_on:
@@ -172,8 +170,8 @@ buildvariants:
     distros:
     - ubuntu1804-xlarge
 
-- name: enterprise-rhel-80-64-bit-dynamic-ninja
-  display_name: "Ninja Build: Enterprise RHEL 8.0"
+- name: enterprise-rhel-8-64-bit-dynamic-ninja
+  display_name: "Ninja Build: Enterprise RHEL 8"
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   modules:
   - enterprise

etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml

@@ -38,8 +38,8 @@ buildvariants:
   tasks:
   - name: build_metrics_gen_TG
 
-- name: &enterprise-rhel-80-64-bit-build-metrics enterprise-rhel-80-64-bit-build-metrics
-  display_name: "~ Build Metrics Enterprise RHEL 8.0 "
+- name: &enterprise-rhel-8-64-bit-build-metrics enterprise-rhel-8-64-bit-build-metrics
+  display_name: "~ Build Metrics Enterprise RHEL 8 "
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter
   stepback: false
   modules:
@@ -58,7 +58,7 @@ buildvariants:
   tasks:
   - name: build_metrics_gen_TG
 
-- name: &enterprise-rhel-80-aarch64-build-metrics enterprise-rhel-80-aarch64-build-metrics
+- name: &enterprise-rhel-8-aarch64-build-metrics enterprise-rhel-8-aarch64-build-metrics
   display_name: "~ Build Metrics Enterprise AL22 ARM"
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter
   stepback: false
@@ -106,6 +106,7 @@ buildvariants:
   - rhel80-small
   expansions:
     multiversion_platform: rhel80
+    multiversion_platform_50_or_later: rhel8
     multiversion_edition: enterprise
     compile_variant: *stm-daily-cron
   stepback: false

etc/evergreen_yml_components/variants/misc/task_generation.yml

@@ -1,4 +1,8 @@
 # Build variant to generate tasks for evergreen versions.
+#
+# Updates to this file may also need to appear in etc/system_perf_yml_components/variants/task_generation.yml,
+# which is the same but excludes resmoke task generation tasks.
+#
 
 buildvariants:
 - name: generate-tasks-for-version

etc/evergreen_yml_components/variants/rhel/test_dev.yml

@@ -28,6 +28,7 @@ variables:
     -j$(grep -c ^processor /proc/cpuinfo)
     --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
     --link-model=dynamic
+    --use-diagnostic-latches=on
 
 # THIS HAS COPIES IN:
 # - etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
@@ -53,6 +54,7 @@ variables:
 # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
 - &linux_x86_generic_expansions
   multiversion_platform: rhel80
+  multiversion_platform_50_or_later: rhel8
   multiversion_edition: enterprise
   repo_edition: enterprise
   large_distro_name: rhel80-medium
@@ -65,7 +67,7 @@ variables:
 # - etc/evergreen_yml_components/variants/rhel/test_dev.yml
 # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
 # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
-- &enterprise-rhel-80-64-bit-dynamic-expansions
+- &enterprise-rhel-8-64-bit-dynamic-expansions
   <<: *linux_x86_generic_expansions
   scons_cache_scope: shared
   scons_cache_mode: all
@@ -122,6 +124,7 @@ variables:
   num_scons_link_jobs_available: 0.99
   large_distro_name: rhel80-build
   multiversion_platform: rhel80
+  multiversion_platform_50_or_later: rhel8
   multiversion_edition: enterprise
   gcov_tool: /opt/mongodbtoolchain/v4/bin/gcov
 
@@ -148,17 +151,17 @@ buildvariants:
       distros:
       - rhel80-large
 
-- &enterprise-rhel-80-64-bit-dynamic-template
+- &enterprise-rhel-8-64-bit-dynamic-template
   <<: *linux_x86_dynamic_compile_variant_dependency
-  name: &enterprise-rhel-80-64-bit-dynamic enterprise-rhel-80-64-bit-dynamic
-  display_name: "* Shared Library Enterprise RHEL 8.0"
+  name: &enterprise-rhel-8-64-bit-dynamic enterprise-rhel-8-64-bit-dynamic
+  display_name: "! Shared Library Enterprise RHEL 8"
   cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
   modules:
   - enterprise
   run_on:
   - rhel80-small
   expansions:
-    <<: *enterprise-rhel-80-64-bit-dynamic-expansions
+    <<: *enterprise-rhel-8-64-bit-dynamic-expansions
   depends_on:
   - name: archive_dist_test_debug
     variant: *linux_x86_dynamic_compile_variant_name
@@ -262,62 +265,63 @@ buildvariants:
   - name: vector_search_auth
   - name: vector_search_ssl
 
-# TODO (SERVER-75884): Remove this variant once we switch to config shard as the default.
-# This build variant is used to test suites that use sharded cluster fixture with config shard mode.
-- &enterprise-rhel-80-64-bit-dynamic-config-shard
-  <<: *linux_x86_dynamic_compile_variant_dependency
-  name: enterprise-rhel-80-64-bit-dynamic-config-shard
-  display_name: "* Shared Library Enterprise RHEL 8.0 (Config Shard)"
-  cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
-  modules:
-  - enterprise
-  run_on:
-  - rhel80-small
-  stepback: false
-  expansions: &enterprise-rhel-80-64-bit-dynamic-config-shard-expansions
-    <<: *enterprise-rhel-80-64-bit-dynamic-expansions
-    test_flags: >-
-      --configShard=any
-      --excludeWithAnyTags=config_shard_incompatible
-  tasks:
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_sharded_collections_causally_consistent_passthrough
-  - name: aggregation_sharded_collections_passthrough
-  - name: causally_consistent_hedged_reads_jscore_passthrough_gen
-  - name: causally_consistent_jscore_passthrough_auth_gen
-  - name: causally_consistent_jscore_passthrough_gen
-  - name: change_streams
-  - name: change_streams_mongos_sessions_passthrough
-  - name: change_streams_multi_stmt_txn_mongos_passthrough
-  - name: change_streams_multi_stmt_txn_sharded_collections_passthrough
-  - name: change_streams_per_shard_cursor_passthrough
-  - name: fle2_sharding_high_cardinality
-  - name: fle2_sharding
-  - name: jstestfuzz_sharded_causal_consistency_gen
-  - name: jstestfuzz_sharded_continuous_stepdown_gen
-  - name: jstestfuzz_sharded_gen
-  - name: jstestfuzz_sharded_session_gen
-  - name: sharded_causally_consistent_jscore_passthrough_gen
-  - name: sharded_causally_consistent_read_concern_snapshot_passthrough_gen
-  - name: sharding_auth_gen
-  # Explicitly include instead of using tags to avoid pulling in replica_sets_multiversion_gen. This
-  # variant will be removed when config shards become the default, so this is only temporary.
-  - name: sharding_multiversion_gen
-  - name: .sharding .txns
-  # Skip csrs stepdown suite because most tests can't handle the first shard stepping down.
-  - name: .sharding .common !.csrs
-  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: .concurrency .sharded !.large
-  - name: .concurrency .sharded .large
-    distros:
-    - rhel80-medium
-  - name: .multi_shard
+# # TODO (SERVER-86211): Re-enable this variant once all the tests work.
+# # TODO (SERVER-75884): Remove this variant once we switch to config shard as the default.
+# # This build variant is used to test suites that use sharded cluster fixture with config shard mode.
+# - &enterprise-rhel-8-64-bit-dynamic-config-shard
+#   <<: *linux_x86_dynamic_compile_variant_dependency
+#   name: enterprise-rhel-8-64-bit-dynamic-config-shard
+#   display_name: "* Shared Library Enterprise RHEL 8 (Config Shard)"
+#   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
+#   modules:
+#   - enterprise
+#   run_on:
+#   - rhel80-small
+#   stepback: false
+#   expansions: &enterprise-rhel-8-64-bit-dynamic-config-shard-expansions
+#     <<: *enterprise-rhel-8-64-bit-dynamic-expansions
+#     test_flags: >-
+#       --configShard=any
+#       --excludeWithAnyTags=config_shard_incompatible
+#   tasks:
+#   - name: aggregation_mongos_passthrough
+#   - name: aggregation_one_shard_sharded_collections
+#   - name: aggregation_sharded_collections_causally_consistent_passthrough
+#   - name: aggregation_sharded_collections_passthrough
+#   - name: causally_consistent_hedged_reads_jscore_passthrough_gen
+#   - name: causally_consistent_jscore_passthrough_auth_gen
+#   - name: causally_consistent_jscore_passthrough_gen
+#   - name: change_streams
+#   - name: change_streams_mongos_sessions_passthrough
+#   - name: change_streams_multi_stmt_txn_mongos_passthrough
+#   - name: change_streams_multi_stmt_txn_sharded_collections_passthrough
+#   - name: change_streams_per_shard_cursor_passthrough
+#   - name: fle2_sharding_high_cardinality
+#   - name: fle2_sharding
+#   - name: jstestfuzz_sharded_causal_consistency_gen
+#   - name: jstestfuzz_sharded_continuous_stepdown_gen
+#   - name: jstestfuzz_sharded_gen
+#   - name: jstestfuzz_sharded_session_gen
+#   - name: sharded_causally_consistent_jscore_passthrough_gen
+#   - name: sharded_causally_consistent_read_concern_snapshot_passthrough_gen
+#   - name: sharding_auth_gen
+#   # Explicitly include instead of using tags to avoid pulling in replica_sets_multiversion_gen. This
+#   # variant will be removed when config shards become the default, so this is only temporary.
+#   - name: sharding_multiversion_gen
+#   - name: .sharding .txns
+#   # Skip csrs stepdown suite because most tests can't handle the first shard stepping down.
+#   - name: .sharding .common !.csrs
+#   - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+#   - name: .concurrency .sharded !.large
+#   - name: .concurrency .sharded .large
+#     distros:
+#     - rhel80-medium
+#   - name: .multi_shard
 
-- &enterprise-rhel-80-64-bit-dynamic-classic-engine
+- &enterprise-rhel-8-64-bit-dynamic-classic-engine
   <<: *linux_x86_dynamic_compile_variant_dependency
-  name: enterprise-rhel-80-64-bit-dynamic-classic-engine
-  display_name: "Shared Library Enterprise RHEL 8.0 (Classic Engine)"
+  name: enterprise-rhel-8-64-bit-dynamic-classic-engine
+  display_name: "Shared Library Enterprise RHEL 8 (Classic Engine)"
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   modules:
   - enterprise
@@ -325,13 +329,14 @@ buildvariants:
   - rhel80-small
   stepback: false
   expansions:
-    <<: *enterprise-rhel-80-64-bit-dynamic-expansions
+    <<: *enterprise-rhel-8-64-bit-dynamic-expansions
     jstestfuzz_num_generated_files: 40
     jstestfuzz_concurrent_num_files: 10
     target_resmoke_time: 10
     max_sub_suites: 5
     test_flags: >-
       --mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
+      --excludeWithAnyTags=featureFlagSbeFull
     large_distro_name: rhel80-medium
   depends_on:
   - name: archive_dist_test_debug
@@ -442,8 +447,8 @@ buildvariants:
 ###########################################
 
 - <<: *linux_debug_aubsan_compile_variant_dependency
-  name: &rhel80-debug-aubsan-classic-engine rhel80-debug-aubsan-classic-engine
-  display_name: "* {A,UB}SAN Enterprise RHEL 8.0 DEBUG (Classic Engine)"
+  name: &rhel8-debugaubsan-classic-engine rhel8-debugaubsan-classic-engine
+  display_name: "* {A,UB}SAN Enterprise RHEL 8 DEBUG (Classic Engine)"
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   modules:
   - enterprise
@@ -453,7 +458,7 @@ buildvariants:
     <<: *aubsan-lite-required-expansions
     test_flags: >-
       --mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
-      --excludeWithAnyTags=requires_ocsp_stapling,requires_increased_memlock_limits
+      --excludeWithAnyTags=requires_ocsp_stapling,requires_increased_memlock_limits,featureFlagSbeFull
   tasks:
   - name: .aggregation !.sbe_only
   - name: .auth
@@ -488,7 +493,8 @@ buildvariants:
   - name: sasl
   - name: secondary_reads_passthrough_gen
   - name: session_jscore_passthrough
-  - name: .sharding .jscore !.wo_snapshot
+  # TODO SERVER-85584 Reenable uninitialized_fcv passthrough
+  - name: .sharding .jscore !.wo_snapshot !.uninitialized_fcv
   - name: .sharding .common !.csrs !.jstestfuzz
   - name: .updatefuzzer
   - name: .serverless