SERVER-97309 split unittests into 8 groups (#32027)

GitOrigin-RevId: 410c1578485d2b8ffc06df5a6dd99e39c9abf511

SConstruct

@@ -6830,6 +6830,7 @@ if env.get("__NINJA_NO") != "1":
         for installed_debug_file in installed_debugs:
             env.Depends(installed_debug_file, debugs)
 
+        setattr(installed_prog[0].attributes, "separate_debug_files", installed_debugs)
         setattr(t.attributes, "AIB_INSTALLED_FILES", installed_prog)
 
         return target, source
@@ -7090,10 +7091,14 @@ 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",
+    "install-first_group_unittests",
+    "install-second_group_unittests",
+    "install-third_group_unittests",
+    "install-fourth_group_unittests",
+    "install-fifth_group_unittests",
+    "install-sixth_group_unittests",
+    "install-seventh_group_unittests",
+    "install-eighth_group_unittests",
     # TODO SERVER-97990 Not all unittests are being excluded.
     "install-mongo-crypt-test",
     "install-stitch-support-test",
@@ -7115,10 +7120,14 @@ env.Alias(
 env.Alias(
     "prove-unittests",
     [
-        "prove-first-quarter-unittests",
-        "prove-second-quarter-unittests",
-        "prove-third-quarter-unittests",
-        "prove-fourth-quarter-unittests",
+        "prove-first_group_unittests",
+        "prove-second_group_unittests",
+        "prove-third_group_unittests",
+        "prove-fourth_group_unittests",
+        "prove-fifth_group_unittests",
+        "prove-sixth_group_unittests",
+        "prove-seventh_group_unittests",
+        "prove-eighth_group_unittests",
     ],
 )
 

buildscripts/resmokeconfig/suites/unittests_eighth_group.yml

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

buildscripts/resmokeconfig/suites/unittests_fifth_group.yml

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

buildscripts/resmokeconfig/suites/unittests_first_group.yml

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

buildscripts/resmokeconfig/suites/unittests_fourth_group.yml

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

buildscripts/resmokeconfig/suites/unittests_second_group.yml

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

buildscripts/resmokeconfig/suites/unittests_seventh_group.yml

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

buildscripts/resmokeconfig/suites/unittests_sixth_group.yml

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

buildscripts/resmokeconfig/suites/unittests_third_group.yml

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

buildscripts/resmokelib/config.py

@@ -683,8 +683,8 @@ 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"]
+    f"build/{test_group}_group_unittests.txt"
+    for test_group in ["first", "second", "third", "fourth", "fifth", "sixth", "seventh", "eighth"]
 ]
 BENCHMARK_SUITE_TEST_LISTS = [
     "build/repl_bm.txt",

buildscripts/unittest_grouper.py

@@ -18,6 +18,17 @@ from buildscripts.install_bazel import install_bazel
 
 RELEASE_URL = "https://github.com/bazelbuild/buildtools/releases/download/v7.3.1/"
 
+groups_sort_keys = {
+    "first": 1,
+    "second": 2,
+    "third": 3,
+    "fourth": 4,
+    "fifth": 5,
+    "sixth": 6,
+    "seventh": 7,
+    "eighth": 8,
+}
+
 
 def determine_platform():
     syst = platform.system()
@@ -67,23 +78,27 @@ def find_group(unittest_paths):
         # group1
         "0": "first",
         "1": "first",
-        "2": "first",
-        "3": "first",
         # group2
-        "4": "second",
-        "5": "second",
-        "6": "second",
-        "7": "second",
+        "2": "second",
+        "3": "second",
         # group3
-        "8": "third",
-        "9": "third",
-        "a": "third",
-        "b": "third",
+        "4": "third",
+        "5": "third",
         # group4
-        "c": "fourth",
-        "d": "fourth",
-        "e": "fourth",
-        "f": "fourth",
+        "6": "fourth",
+        "7": "fourth",
+        # group5
+        "8": "fifth",
+        "9": "fifth",
+        # group6
+        "a": "sixth",
+        "b": "sixth",
+        # group7
+        "c": "seventh",
+        "d": "seventh",
+        # group8
+        "e": "eighth",
+        "f": "eighth",
     }
 
     group_to_path: Dict[str, List[str]] = {}
@@ -116,6 +131,14 @@ def find_group(unittest_paths):
     return json.dumps(group_to_path, indent=4)
 
 
+def find_multiple_groups(test, groups):
+    tagged_groups = []
+    for group in groups:
+        if test in groups[group]:
+            tagged_groups.append(group)
+    return tagged_groups
+
+
 def validate_bazel_groups(generate_report, fix):
     buildozer = download_buildozer()
 
@@ -158,7 +181,7 @@ def validate_bazel_groups(generate_report, fix):
 
     groups = json.loads(find_group(bazel_unittests))
     failures = []
-    for group in groups:
+    for group in sorted(groups, key=lambda x: groups_sort_keys[x]):
         try:
             start = time.time()
             sys.stdout.write(f"Query all mongo_unittest_{group}_group unittests... ")
@@ -203,9 +226,21 @@ def validate_bazel_groups(generate_report, fix):
                         [test + " tag", f"{test} missing 'mongo_unittest_{group}_group'"]
                     )
                     print(failures[-1][1])
+                    if fix:
+                        buildozer_update_cmds += [[f"add tags mongo_unittest_{group}_group", test]]
+
+            for test in group_tests:
+                if test not in groups[group]:
+                    failures.append(
+                        [
+                            test + " tag",
+                            f"{test} is tagged in the wrong group.",
+                        ]
+                    )
+                    print(failures[-1][1])
                     if fix:
                         buildozer_update_cmds += [
-                            [buildozer, f"add tags mongo_unittest_{group}_group", test]
+                            [f"remove tags mongo_unittest_{group}_group", test]
                         ]
 
     if fix:

etc/evergreen_yml_components/tasks/compile_tasks.yml

@@ -844,7 +844,7 @@ tasks:
           task_compile_flags: ${unittest_compile_flags}
           bazel_build_tags: --bazel-build-tag=mongo_library
 
-  - name: compile_and_run_unittests_first_quarter
+  - name: compile_and_run_unittests_first_group
     tags: ["assigned_to_jira_team_devprod_build", "auxiliary"]
     depends_on:
       - name: version_expansions_gen
@@ -854,7 +854,7 @@ tasks:
     commands:
       - func: "scons compile"
         vars:
-          targets: install-first-quarter-unittests install-first-quarter-unittests-debug
+          targets: install-first_group_unittests install-first_group_unittests-debug
           compiling_for_test: true
           task_compile_flags: ${unittest_compile_flags}
           bazel_build_tags: --bazel-build-tag=mongo_unittest_first_group --bazel-build-tag=mongo_binary_unittest --bazel-build-tag=mongo_library
@@ -865,11 +865,11 @@ tasks:
       - func: "collect system resource info"
       - func: "run tests"
         vars:
-          suite: unittests_first_quarter
+          suite: unittests_first_group
           install_dir: build/install/bin
           exec_timeout_secs: 32400 # 9 hours
 
-  - name: compile_and_run_unittests_second_quarter
+  - name: compile_and_run_unittests_second_group
     tags: ["assigned_to_jira_team_devprod_build", "auxiliary"]
     depends_on:
       - name: version_expansions_gen
@@ -879,10 +879,10 @@ tasks:
     commands:
       - func: "scons compile"
         vars:
-          targets: install-second-quarter-unittests install-second-quarter-unittests-debug
+          targets: install-second_group_unittests install-second_group_unittests-debug
           compiling_for_test: true
           task_compile_flags: ${unittest_compile_flags}
-          bazel_build_tags: --bazel-build-tag=mongo_unittest_second_group --bazel-build-tag=mongo_binary_unittest --bazel-build-tag=stitch_support_test --bazel-build-tag=mongo_library
+          bazel_build_tags: --bazel-build-tag=mongo_unittest_second_group --bazel-build-tag=mongo_binary_unittest --bazel-build-tag=mongo_library
       - func: "f_expansions_write"
       - func: "run diskstats"
       - func: "f_expansions_write"
@@ -890,11 +890,11 @@ tasks:
       - func: "collect system resource info"
       - func: "run tests"
         vars:
-          suite: unittests_second_quarter
+          suite: unittests_second_group
           install_dir: build/install/bin
           exec_timeout_secs: 32400 # 9 hours
 
-  - name: compile_and_run_unittests_third_quarter
+  - name: compile_and_run_unittests_third_group
     tags: ["assigned_to_jira_team_devprod_build", "auxiliary"]
     depends_on:
       - name: version_expansions_gen
@@ -904,7 +904,7 @@ tasks:
     commands:
       - func: "scons compile"
         vars:
-          targets: install-third-quarter-unittests install-third-quarter-unittests-debug
+          targets: install-third_group_unittests install-third_group_unittests-debug
           compiling_for_test: true
           task_compile_flags: ${unittest_compile_flags}
           bazel_build_tags: --bazel-build-tag=mongo_unittest_third_group --bazel-build-tag=mongo_binary_unittest --bazel-build-tag=mongo_library
@@ -915,11 +915,11 @@ tasks:
       - func: "collect system resource info"
       - func: "run tests"
         vars:
-          suite: unittests_third_quarter
+          suite: unittests_third_group
           install_dir: build/install/bin
           exec_timeout_secs: 32400 # 9 hours
 
-  - name: compile_and_run_unittests_fourth_quarter
+  - name: compile_and_run_unittests_fourth_group
     tags: ["assigned_to_jira_team_devprod_build", "auxiliary"]
     depends_on:
       - name: version_expansions_gen
@@ -929,7 +929,7 @@ tasks:
     commands:
       - func: "scons compile"
         vars:
-          targets: install-fourth-quarter-unittests install-fourth-quarter-unittests-debug
+          targets: install-fourth_group_unittests install-fourth_group_unittests-debug
           compiling_for_test: true
           task_compile_flags: ${unittest_compile_flags}
           bazel_build_tags: --bazel-build-tag=mongo_unittest_fourth_group --bazel-build-tag=mongo_binary_unittest --bazel-build-tag=mongo_library
@@ -940,7 +940,107 @@ tasks:
       - func: "collect system resource info"
       - func: "run tests"
         vars:
-          suite: unittests_fourth_quarter
+          suite: unittests_fourth_group
+          install_dir: build/install/bin
+          exec_timeout_secs: 32400 # 9 hours
+
+  - name: compile_and_run_unittests_fifth_group
+    tags: ["assigned_to_jira_team_devprod_build", "auxiliary"]
+    depends_on:
+      - name: version_expansions_gen
+        variant: generate-tasks-for-version
+      - name: compile_libraries_for_unittests
+    exec_timeout_secs: 32400 # 9 hours
+    commands:
+      - func: "scons compile"
+        vars:
+          targets: install-fifth_group_unittests install-fifth_group_unittests-debug
+          compiling_for_test: true
+          task_compile_flags: ${unittest_compile_flags}
+          bazel_build_tags: --bazel-build-tag=mongo_unittest_fifth_group --bazel-build-tag=mongo_binary_unittest --bazel-build-tag=mongo_library
+      - 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_fifth_group
+          install_dir: build/install/bin
+          exec_timeout_secs: 32400 # 9 hours
+
+  - name: compile_and_run_unittests_sixth_group
+    tags: ["assigned_to_jira_team_devprod_build", "auxiliary"]
+    depends_on:
+      - name: version_expansions_gen
+        variant: generate-tasks-for-version
+      - name: compile_libraries_for_unittests
+    exec_timeout_secs: 32400 # 9 hours
+    commands:
+      - func: "scons compile"
+        vars:
+          targets: install-sixth_group_unittests install-sixth_group_unittests-debug
+          compiling_for_test: true
+          task_compile_flags: ${unittest_compile_flags}
+          bazel_build_tags: --bazel-build-tag=mongo_unittest_sixth_group --bazel-build-tag=mongo_binary_unittest --bazel-build-tag=mongo_library
+      - 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_sixth_group
+          install_dir: build/install/bin
+          exec_timeout_secs: 32400 # 9 hours
+
+  - name: compile_and_run_unittests_seventh_group
+    tags: ["assigned_to_jira_team_devprod_build", "auxiliary"]
+    depends_on:
+      - name: version_expansions_gen
+        variant: generate-tasks-for-version
+      - name: compile_libraries_for_unittests
+    exec_timeout_secs: 32400 # 9 hours
+    commands:
+      - func: "scons compile"
+        vars:
+          targets: install-seventh_group_unittests install-seventh_group_unittests-debug
+          compiling_for_test: true
+          task_compile_flags: ${unittest_compile_flags}
+          bazel_build_tags: --bazel-build-tag=mongo_unittest_seventh_group --bazel-build-tag=mongo_binary_unittest --bazel-build-tag=mongo_library
+      - 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_seventh_group
+          install_dir: build/install/bin
+          exec_timeout_secs: 32400 # 9 hours
+
+  - name: compile_and_run_unittests_eighth_group
+    tags: ["assigned_to_jira_team_devprod_build", "auxiliary"]
+    depends_on:
+      - name: version_expansions_gen
+        variant: generate-tasks-for-version
+      - name: compile_libraries_for_unittests
+    exec_timeout_secs: 32400 # 9 hours
+    commands:
+      - func: "scons compile"
+        vars:
+          targets: install-eighth_group_unittests install-eighth_group_unittests-debug
+          compiling_for_test: true
+          task_compile_flags: ${unittest_compile_flags}
+          bazel_build_tags: --bazel-build-tag=mongo_unittest_eighth_group --bazel-build-tag=mongo_binary_unittest --bazel-build-tag=mongo_library
+      - 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_eighth_group
           install_dir: build/install/bin
           exec_timeout_secs: 32400 # 9 hours
 
@@ -2159,10 +2259,14 @@ task_groups:
     max_hosts: -1
     tasks:
       - compile_libraries_for_unittests
-      - compile_and_run_unittests_first_quarter
-      - compile_and_run_unittests_second_quarter
-      - compile_and_run_unittests_third_quarter
-      - compile_and_run_unittests_fourth_quarter
+      - compile_and_run_unittests_first_group
+      - compile_and_run_unittests_second_group
+      - compile_and_run_unittests_third_group
+      - compile_and_run_unittests_fourth_group
+      - compile_and_run_unittests_fifth_group
+      - compile_and_run_unittests_sixth_group
+      - compile_and_run_unittests_seventh_group
+      - compile_and_run_unittests_eighth_group
 
   - <<: *compile_task_group_template
     name: compile_unittest_libaries_TG

site_scons/site_tools/mongo_unittest.py

@@ -55,10 +55,10 @@ def build_cpp_unit_test(env, target, source, **kwargs):
 
     if test_group not in TEST_GROUPS:
         TEST_GROUPS.append(test_group)
-        env.TestList(f"$BUILD_ROOT/{test_group}_quarter_unittests.txt", source=[])
+        env.TestList(f"$BUILD_ROOT/{test_group}_group_unittests.txt", source=[])
         env.Alias(
-            f"install-{test_group}-quarter-unittests",
-            f"$BUILD_ROOT/{test_group}_quarter_unittests.txt",
+            f"install-{test_group}_group_unittests",
+            f"$BUILD_ROOT/{test_group}_group_unittests.txt",
         )
 
     if not kwargs.get("UNITTEST_HAS_CUSTOM_MAINLINE", False):
@@ -73,7 +73,7 @@ def build_cpp_unit_test(env, target, source, **kwargs):
     elif primary_component:
         kwargs["AIB_COMPONENT"] = primary_component
     else:
-        kwargs["AIB_COMPONENT"] = f"{test_group}-quarter-unittests"
+        kwargs["AIB_COMPONENT"] = f"{test_group}_group_unittests"
 
     if "AIB_COMPONENTS_EXTRA" in kwargs:
         kwargs["AIB_COMPONENTS_EXTRA"] = set(kwargs["AIB_COMPONENTS_EXTRA"]).union(
@@ -96,10 +96,13 @@ def build_cpp_unit_test(env, target, source, **kwargs):
     env.Alias("$UNITTEST_ALIAS", result[0])
 
     env.RegisterTest(
-        f"$BUILD_ROOT/{test_group}_quarter_unittests.txt", result[0], generate_alias=False
+        f"$BUILD_ROOT/{test_group}_group_unittests.txt", result[0], generate_alias=False
     )
-    env.Alias(f"install-{test_group}-quarter-unittests", result[0])
-
+    install_file = env.GetAutoInstalledFiles(result[0])
+    if install_file:
+        debug_file = getattr(install_file[0].attributes, "separate_debug_files")
+        env.Alias(f"install-{test_group}_group_unittests", env.GetAutoInstalledFiles(result[0]))
+        env.Alias(f"install-{test_group}_group_unittests-debug", debug_file)
     return result
 
 

src/mongo/base/BUILD.bazel

@@ -1,6 +1,6 @@
+load("@poetry//:dependencies.bzl", "dependency")
 load("//bazel:mongo_src_rules.bzl", "mongo_cc_benchmark", "mongo_cc_library", "mongo_cc_unit_test")
 load("//bazel/config:render_template.bzl", "render_template")
-load("@poetry//:dependencies.bzl", "dependency")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -132,7 +132,7 @@ mongo_cc_unit_test(
         "//src/mongo/base:data_type_validated.h",
     ],
     tags = [
-        "mongo_unittest_fourth_group",
+        "mongo_unittest_seventh_group",
         "platform",
         "server-programmability",
     ],

src/mongo/bson/column/BUILD.bazel

@@ -89,7 +89,7 @@ mongo_cc_unit_test(
         "simple8b_test.cpp",
         "simple8b_type_util_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":bson_column_fuzzer_impl",
         ":bsoncolumn_test_util",

src/mongo/bson/util/BUILD.bazel

@@ -40,7 +40,7 @@ mongo_cc_unit_test(
         "bson_extract_test.cpp",
         "builder_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":bson_extract",
         "//src/mongo:base",

src/mongo/client/BUILD.bazel

@@ -599,7 +599,7 @@ mongo_cc_unit_test(
     data = [
         "//src/mongo/client/mongo_uri_tests:test_data",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],
@@ -637,7 +637,7 @@ mongo_cc_unit_test(
     srcs = [
         "dbclient_rs_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":clientdriver_network",
         ":replica_set_monitor_test_helper",
@@ -653,7 +653,7 @@ mongo_cc_unit_test(
     srcs = [
         "dbclient_grpc_stream_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     target_compatible_with = select({
         "//bazel/config:build_grpc_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],
@@ -670,7 +670,7 @@ mongo_cc_unit_test(
 mongo_cc_unit_test(
     name = "scoped_db_connection_pool_test",
     srcs = ["scoped_db_connection_test.cpp"],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         ":clientdriver_network",
         "//src/mongo/dbtests:mocklib",
@@ -682,7 +682,7 @@ mongo_cc_unit_test(
     srcs = [
         "dbclient_connection_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":clientdriver_network",
         "//src/mongo/util:version_impl",

src/mongo/client/sdam/BUILD.bazel

@@ -104,7 +104,7 @@ mongo_cc_unit_test(
         "topology_manager_test.cpp",
         "topology_state_machine_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":sdam",
         ":sdam_test_util",

src/mongo/crypto/BUILD.bazel

@@ -438,7 +438,7 @@ mongo_cc_unit_test(
         "//bazel/config:mongo_crypto_openssl": ["jwt_test.cpp"],
         "//conditions:default": [],
     }),
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":aead_encryption",
         ":encrypted_field_config",
@@ -467,7 +467,7 @@ mongo_cc_unit_test(
         "jws_validated_token_test.cpp",
         "jws_validator_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     target_compatible_with = select({
         "//bazel/config:mongo_crypto_openssl": [],
         "//conditions:default": ["@platforms//:incompatible"],

src/mongo/db/BUILD.bazel

@@ -695,7 +695,7 @@ mongo_cc_unit_test(
         "db_raii_test.cpp",
         "shard_role_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":query_exec",
         ":shard_role",
@@ -722,7 +722,7 @@ mongo_cc_unit_test(
         "//src/mongo/db/query:multiple_collection_accessor.h",
         "//src/mongo/db/query:multiple_collection_accessor_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":query_exec",
         ":shard_role",
@@ -755,7 +755,7 @@ mongo_cc_unit_test(
         "vector_clock_test_fixture.cpp",
         "vector_clock_test_fixture.h",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":keys_collection_client_direct",
         ":keys_collection_document",
@@ -2091,7 +2091,7 @@ mongo_cc_unit_test(
     name = "throw_hook_impl_test",
     srcs = ["throw_hook_impl_test.cpp"],
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_third_group",
         "server-programmability",
     ],
     target_compatible_with = select({
@@ -2875,7 +2875,7 @@ mongo_cc_unit_test(
         "//src/mongo/db/query/fle:range_predicate_test.cpp",
         "//src/mongo/db/query/fle:range_validator_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],
@@ -3738,7 +3738,7 @@ mongo_cc_unit_test(
         "client_out_of_line_executor_test.cpp",
     ],
     tags = [
-        "mongo_unittest_fourth_group",
+        "mongo_unittest_seventh_group",
         "server-programmability",
     ],
     deps = [
@@ -3754,7 +3754,7 @@ mongo_cc_unit_test(
         "//src/mongo/util:database_name_util_test.cpp",
         "//src/mongo/util:namespace_string_util_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         "//src/mongo/db:server_base",
         "//src/mongo/idl:server_parameter_test_util",
@@ -3766,7 +3766,7 @@ mongo_cc_unit_test(
     srcs = [
         "server_lifecycle_monitor_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         ":server_lifecycle_monitor",
     ],
@@ -3777,7 +3777,7 @@ mongo_cc_unit_test(
     srcs = [
         "profile_settings_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         "profile_settings",
     ],
@@ -3800,7 +3800,7 @@ mongo_cc_unit_test(
         "service_entry_point_shard_role_test.cpp",
     ],
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_third_group",
         "server-programmability",
     ],
     deps = [
@@ -3817,7 +3817,7 @@ mongo_cc_unit_test(
         "change_stream_pre_images_truncate_manager_test.cpp",
         "change_stream_pre_images_truncate_markers_per_nsUUID_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":change_stream_options",
         ":change_stream_options_manager",
@@ -3845,7 +3845,7 @@ mongo_cc_unit_test(
         "mongod_options_test.cpp",
     ],
     tags = [
-        "mongo_unittest_third_group",
+        "mongo_unittest_sixth_group",
         "server-programmability",
     ],
     deps = [
@@ -3872,7 +3872,7 @@ mongo_cc_unit_test(
         "shard_id_test.cpp",
         "startup_warnings_mongod_thp_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],
@@ -3900,7 +3900,7 @@ mongo_cc_unit_test(
     srcs = [
         "change_collection_expired_change_remover_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],
@@ -3933,7 +3933,7 @@ mongo_cc_unit_test(
         "multi_key_path_tracker_test.cpp",
         "update_index_data_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],
@@ -3973,7 +3973,7 @@ mongo_cc_unit_test(
         "curop_stats_test.cpp",
         "curop_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],
@@ -4015,7 +4015,7 @@ mongo_cc_unit_test(
         "//src/mongo/db/session:session_catalog_test.h",
         "//src/mongo/unittest:ensure_fcv.h",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],
@@ -4055,7 +4055,7 @@ mongo_cc_unit_test(
         "default_baton_test.cpp",
     ],
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_fourth_group",
         "server-programmability",
     ],
     deps = [
@@ -4088,7 +4088,7 @@ mongo_cc_unit_test(
         "//src/mongo/util:executor_test_util.h",
     ],
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_fourth_group",
         "server-programmability",
     ],
     target_compatible_with = select({
@@ -4154,7 +4154,7 @@ mongo_cc_unit_test(
         "write_concern_options_test.cpp",
         "write_concern_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":rw_concern_d",
         ":service_context_test_fixture",
@@ -4175,7 +4175,7 @@ mongo_cc_unit_test(
         "keys_collection_manager_sharding_test.cpp",
         "logical_time_validator_test.cpp",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":keys_collection_client_direct",
         ":vector_clock",
@@ -4191,7 +4191,7 @@ mongo_cc_unit_test(
     srcs = [
         "op_msg_fuzzer_fixture_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":op_msg_fuzzer_fixture",
         ":server_base",
@@ -4204,7 +4204,7 @@ mongo_cc_unit_test(
     srcs = [
         "prepare_conflict_tracker_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":prepare_conflict_tracker",
         "//src/mongo/util:tick_source_mock",
@@ -4254,7 +4254,7 @@ mongo_cc_unit_test(
     srcs = [
         "profile_filter_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":service_context_test_fixture",
         "//src/mongo/db/commands:profile_common",

src/mongo/db/admission/BUILD.bazel

@@ -129,7 +129,7 @@ mongo_cc_unit_test(
     srcs = [
         "ingress_admission_control_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":ingress_admission_control",
         "//src/mongo/db:service_context_test_fixture",
@@ -142,7 +142,7 @@ mongo_cc_unit_test(
     srcs = [
         "throughput_probing_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":execution_control",
         "//src/mongo/db:service_context",

src/mongo/db/auth/BUILD.bazel

@@ -880,10 +880,10 @@ mongo_cc_unit_test(
         "//jstests/libs:server.pem",
     ],
     tags = [
-        "mongo_unittest_third_group",
         # Segfaults in sandbox
         "code_coverage_quarantine",
         "code_coverage_quarantine_SERVER-98844",
+        "mongo_unittest_fifth_group",
     ],
     deps = [
         ":address_restriction",

src/mongo/db/catalog/BUILD.bazel

@@ -706,7 +706,7 @@ mongo_cc_unit_test(
         "//src/mongo/db/catalog/validate:index_consistency_test.cpp",
         "//src/mongo/db/catalog/validate:validate_results_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],

src/mongo/db/catalog/util/BUILD.bazel

@@ -14,7 +14,7 @@ mongo_cc_unit_test(
     srcs = [
         "partitioned_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         "//src/mongo:core_headers_library",
     ],

src/mongo/db/commands/BUILD.bazel

@@ -1657,7 +1657,7 @@ mongo_cc_unit_test(
     srcs = [
         "command_mirroring_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         ":standalone",
         "//src/mongo:base",
@@ -1697,7 +1697,7 @@ mongo_cc_unit_test(
             "//src/mongo/db/commands/query_cmd:mr_test.cpp",
         ],
     }),
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":cluster_server_parameter_commands_invocation",
         ":core",

src/mongo/db/commands/query_cmd/BUILD.bazel

@@ -308,7 +308,7 @@ mongo_cc_unit_test(
         "map_reduce_agg_test.cpp",
         "map_reduce_parse_test.cpp",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":map_reduce_agg",
         "//src/mongo/db:service_context_d_test_fixture",

src/mongo/db/concurrency/BUILD.bazel

@@ -203,7 +203,7 @@ mongo_cc_unit_test(
         "exception_util_test.cpp",
     ],
     tags = [
-        "mongo_unittest_first_group",
+        "mongo_unittest_second_group",
         "server-programmability",
     ],
     deps = [
@@ -224,7 +224,7 @@ mongo_cc_unit_test(
         "locker_test.cpp",
         "resource_catalog_test.cpp",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":exception_util",
         ":lock_manager",

src/mongo/db/exec/BUILD.bazel

@@ -204,7 +204,7 @@ mongo_cc_unit_test(
         "//src/mongo/db/exec/expression:evaluate_trigonometric_test.cpp",
         "//src/mongo/db/exec/timeseries:bucket_unpacker_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":projection_executor",
         ":query_shard_server_test_fixture",

src/mongo/db/exec/mutable_bson/BUILD.bazel

@@ -47,7 +47,7 @@ mongo_cc_unit_test(
         "mutable_bson_algo_test.cpp",
         "mutable_bson_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":mutable_bson",
         ":mutable_bson_test_utils",

src/mongo/db/exec/sbe/BUILD.bazel

@@ -541,7 +541,7 @@ mongo_cc_unit_test(
     data = [
         "//src/mongo/db/test_output/exec/sbe:test_data",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":sbe_plan_stage_test",
         "//src/mongo/db:service_context_d_test_fixture",

src/mongo/db/ftdc/BUILD.bazel

@@ -190,7 +190,7 @@ mongo_cc_unit_test(
         "metadata_compressor_test.cpp",
         "varint_test.cpp",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":ftdc",
         "//src/mongo/db:service_context_non_d",

src/mongo/db/fts/BUILD.bazel

@@ -139,7 +139,7 @@ mongo_cc_unit_test(
         "stop_words_test.cpp",
         "tokenizer_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":base_fts",
         "//src/mongo/db:query_expressions",

src/mongo/db/fts/unicode/BUILD.bazel

@@ -87,7 +87,7 @@ mongo_cc_unit_test(
         "codepoints_test.cpp",
         "string_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":unicode",
     ],

src/mongo/db/index/BUILD.bazel

@@ -131,7 +131,7 @@ mongo_cc_unit_test(
         "wildcard_key_generator_test.cpp",
         "wildcard_validation_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":expression_params",
         ":index_access_method",

src/mongo/db/index_builds/BUILD.bazel

@@ -336,7 +336,7 @@ mongo_cc_unit_test(
         "index_builds_manager_test.cpp",
         "multi_index_block_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],

src/mongo/db/memory_tracking/BUILD.bazel

@@ -30,7 +30,7 @@ mongo_cc_unit_test(
         "memory_usage_tracker_test.cpp",
         "op_memory_use_test.cpp",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":memory_tracking",
         "//src/mongo/db:service_context_test_fixture",

src/mongo/db/op_observer/BUILD.bazel

@@ -343,7 +343,7 @@ mongo_cc_unit_test(
         "op_observer_registry_test.cpp",
         "user_write_block_mode_op_observer_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":batched_write_context",
         ":change_stream_pre_images_op_observer",

src/mongo/db/pipeline/BUILD.bazel

@@ -1446,10 +1446,10 @@ mongo_cc_unit_test(
     ],
     tags = [
         "compile_requires_large_memory_gcc",
-        "mongo_unittest_fourth_group",
         # Trying to access /data/db/ is incompatible with the sandbox
         "code_coverage_quarantine",
         "code_coverage_quarantine_SERVER-98846",
+        "mongo_unittest_seventh_group",
     ],
     deps = [
         ":accumulator",
@@ -1524,7 +1524,7 @@ mongo_cc_unit_test(
     srcs = [
         "group_with_acc_n_optimization_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":accumulator",
         ":aggregation_context_fixture",

src/mongo/db/pipeline/spilling/BUILD.bazel

@@ -66,9 +66,7 @@ mongo_cc_unit_test(
         "spillable_map_test.cpp",
         "spilling_stats_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_fourth_group",
-    ],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":spilling_test_utils",
         "//src/mongo/db/exec/document_value:document_value_test_util",

src/mongo/db/process_health/BUILD.bazel

@@ -109,7 +109,7 @@ mongo_cc_unit_test(
         "health_observer_test.cpp",
         "state_machine_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":fault_manager_test_suite",
         "//src/mongo/db:service_context_non_d",

src/mongo/db/query/BUILD.bazel

@@ -823,7 +823,7 @@ mongo_cc_unit_test(
     ],
     tags = [
         "compile_requires_large_memory_gcc",
-        "mongo_unittest_second_group",
+        "mongo_unittest_third_group",
     ],
     deps = [
         "common_query_enums_and_helpers",

src/mongo/db/query/bson/BUILD.bazel

@@ -30,7 +30,7 @@ mongo_cc_unit_test(
     srcs = [
         "dotted_path_support_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":dotted_path_support",
         "//src/mongo/db/exec/document_value",

src/mongo/db/query/ce/BUILD.bazel

@@ -71,7 +71,7 @@ mongo_cc_unit_test(
         "histogram_estimation_impl_test.cpp",
         "histogram_estimator_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         ":ce_test_utils",
     ],
@@ -82,7 +82,7 @@ mongo_cc_unit_test(
     srcs = [
         "maxdiff_histogram_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":ce_test_utils",
     ],
@@ -93,7 +93,7 @@ mongo_cc_unit_test(
     srcs = [
         "generated_histograms_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":ce_test_utils",
         "//src/mongo/db:service_context_test_fixture",
@@ -144,7 +144,7 @@ mongo_cc_unit_test(
     srcs = [
         "sampling_estimator_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         "//src/mongo/db:query_exec",
         "//src/mongo/db/catalog:catalog_test_fixture",

src/mongo/db/query/client_cursor/BUILD.bazel

@@ -114,7 +114,7 @@ mongo_cc_unit_test(
     srcs = [
         "cursor_manager_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":client_cursor",
         "//src/mongo/db:query_exec",

src/mongo/db/query/collation/BUILD.bazel

@@ -109,7 +109,7 @@ mongo_cc_unit_test(
         "collator_interface_mock_test.cpp",
         "//src/mongo/bson:bsonobj_comparator.h",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":collator_factory_mock",
         ":collator_icu",

src/mongo/db/query/cost_based_ranker/BUILD.bazel

@@ -107,7 +107,7 @@ mongo_cc_unit_test(
         "estimates_test.cpp",
         "heuristic_estimator_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":cbr_test_utils",
     ],

src/mongo/db/query/datetime/BUILD.bazel

@@ -40,7 +40,7 @@ mongo_cc_unit_test(
     srcs = [
         "date_time_support_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         ":date_time_support",
         "//src/mongo/db/concurrency:lock_manager",

src/mongo/db/query/optimizer/BUILD.bazel

@@ -43,7 +43,7 @@ mongo_cc_unit_test(
     srcs = [
         "reference_tracker_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":optimizer_base",
         "//src/mongo/db/exec/sbe:query_sbe",  # needed to register extended type destruction for MakeObjSpec :(

src/mongo/db/query/optimizer/algebra/BUILD.bazel

@@ -16,6 +16,6 @@ mongo_cc_unit_test(
         "operator.h",
         "polyvalue.h",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [],
 )

src/mongo/db/query/query_shape/BUILD.bazel

@@ -99,7 +99,7 @@ mongo_cc_unit_test(
         "query_shape_test.cpp",
         ":query_shape_test_gen",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":query_shape",
         "//src/mongo/db:service_context_d_test_fixture",

src/mongo/db/query/query_stats/BUILD.bazel

@@ -97,7 +97,7 @@ mongo_cc_unit_test(
         "rate_limiting_test.cpp",
         "supplemental_metrics_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":query_stats",
         ":rate_limiting",

src/mongo/db/query/search/BUILD.bazel

@@ -208,7 +208,7 @@ mongo_cc_unit_test(
     srcs = [
         "list_search_indexes_authorization_session_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         "//src/mongo/db/auth:auth_checks",
         "//src/mongo/db/auth:authorization_session_test_fixture",

src/mongo/db/query/stage_builder/sbe/BUILD.bazel

@@ -46,7 +46,7 @@ mongo_cc_unit_test(
         "//src/mongo/db/query/stage_builder/sbe/tests:abt_lower_test.cpp",
     ],
     data = ["//src/mongo/db/test_output/query/stage_builder/sbe/a_b_t_plan_generation:test_data"],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":abt_unit_test_utils",
         ":query_sbe_abt",
@@ -61,7 +61,7 @@ mongo_cc_unit_test(
         "//src/mongo/db/exec/sbe:sbe_unittest.h",
         "//src/mongo/db/query/stage_builder/sbe/tests:sbe_abt_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":abt_unit_test_utils",
         ":query_sbe_abt",

src/mongo/db/query/stats/BUILD.bazel

@@ -142,7 +142,7 @@ mongo_cc_unit_test(
         "stats_cache_loader_mock.h",
         "stats_cache_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":stats",
         ":stats_test_utils",
@@ -157,7 +157,7 @@ mongo_cc_unit_test(
     srcs = [
         "stats_path_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":stats_test_utils",
         "//src/mongo:base",
@@ -170,7 +170,7 @@ mongo_cc_unit_test(
     srcs = [
         "type_collision_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":stats_test_utils",
     ],
@@ -181,7 +181,7 @@ mongo_cc_unit_test(
     srcs = [
         "type_count_test.cpp",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":stats_test_utils",
     ],
@@ -192,7 +192,7 @@ mongo_cc_unit_test(
     srcs = [
         "ce_histogram_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":stats_test_utils",
     ],
@@ -203,7 +203,7 @@ mongo_cc_unit_test(
     srcs = [
         "value_utils_test.cpp",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":stats_test_utils",
         ":test_utils",
@@ -218,7 +218,7 @@ mongo_cc_unit_test(
         "stats_cache_loader_test_fixture.cpp",
         "stats_cache_loader_test_fixture.h",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         "//src/mongo/db:multitenancy",
         "//src/mongo/db:query_expressions",

src/mongo/db/query/virtual_collection/BUILD.bazel

@@ -33,7 +33,7 @@ mongo_cc_unit_test(
     srcs = [
         "external_record_store_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":virtual_collection",
         "//src/mongo/db/storage:record_store_base",

src/mongo/db/repl/BUILD.bazel

@@ -2192,7 +2192,7 @@ mongo_cc_unit_test(
     srcs = [
         "idempotency_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],
@@ -2331,7 +2331,7 @@ mongo_cc_unit_test(
     ],
     tags = [
         "compile_requires_large_memory_gcc",
-        "mongo_unittest_third_group",
+        "mongo_unittest_fifth_group",
     ],
     deps = [
         ":isself",
@@ -2363,7 +2363,7 @@ mongo_cc_unit_test(
     ],
     tags = [
         "compile_requires_large_memory_gcc",
-        "mongo_unittest_third_group",
+        "mongo_unittest_fifth_group",
     ],
     deps = [
         ":data_replicator_external_state_mock",
@@ -2403,7 +2403,7 @@ mongo_cc_unit_test(
         "rollback_impl_test.cpp",
         "//src/mongo/db/catalog:collection_mock.h",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":oplog_interface_local",
         ":oplog_interface_remote",
@@ -2429,7 +2429,7 @@ mongo_cc_unit_test(
         "initial_syncer_test.cpp",
         "//src/mongo/db/storage:storage_engine_mock.h",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":abstract_async_component",
         ":data_replicator_external_state_mock",
@@ -2454,7 +2454,7 @@ mongo_cc_unit_test(
         "storage_timestamp_test.cpp",
         "//src/mongo/dbtests:dbtests.h",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":oplog_application",
         ":oplog_entry_test_helpers",
@@ -2489,7 +2489,7 @@ mongo_cc_unit_test(
         "repl_set_tag_test.cpp",
         "//src/mongo/unittest:ensure_fcv.h",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":repl_coordinator_impl",
         ":replmocks",
@@ -2506,7 +2506,7 @@ mongo_cc_unit_test(
         "replication_consistency_markers_impl_test.cpp",
         "replication_recovery_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":oplog_applier_impl_test_fixture",
         ":oplog_entry",
@@ -2521,7 +2521,7 @@ mongo_cc_unit_test(
     srcs = [
         "storage_interface_impl_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":oplog_applier_impl_test_fixture",
         ":replication_process",
@@ -2536,7 +2536,7 @@ mongo_cc_unit_test(
     srcs = [
         "topology_version_observer_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":repl_coordinator_impl",
         ":repl_coordinator_test_fixture",
@@ -2594,7 +2594,7 @@ mongo_cc_unit_test(
         "replica_set_aware_service_test.cpp",
         "//src/mongo/db/catalog:database_holder_mock.h",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":repl_coordinator_impl",
         ":repl_coordinator_test_fixture",

src/mongo/db/s/BUILD.bazel

@@ -1412,7 +1412,7 @@ mongo_cc_unit_test(
     srcs = [
         "shard_server_op_observer_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         ":sharding_runtime_d",
         "//src/mongo/db:service_context_d_test_fixture",
@@ -1517,10 +1517,10 @@ mongo_cc_unit_test(
     ],
     tags = [
         "compile_requires_large_memory_gcc",
-        "mongo_unittest_second_group",
         # State mismatch in sandbox in resharding_recipient_service_test.cpp
         "code_coverage_quarantine",
         "code_coverage_quarantine_SERVER-98847",
+        "mongo_unittest_fourth_group",
     ],
     deps = [
         ":analyze_shard_key_util",
@@ -1620,7 +1620,7 @@ mongo_cc_unit_test(
     ],
     tags = [
         "compile_requires_large_memory_gcc_fission",
-        "mongo_unittest_fourth_group",
+        "mongo_unittest_seventh_group",
     ],
     deps = [
         ":config_server_test_fixture",

src/mongo/db/sorter/BUILD.bazel

@@ -65,9 +65,7 @@ mongo_cc_unit_test(
         "sorter_stats_test.cpp",
         "sorter_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_first_group",
-    ],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":sorter_base",
         ":sorter_stats",

src/mongo/db/storage/key_string/BUILD.bazel

@@ -29,9 +29,7 @@ mongo_cc_unit_test(
         "key_string_test.cpp",
         "//src/mongo/bson:bsonobj_comparator.h",
     ],
-    tags = [
-        "mongo_unittest_second_group",
-    ],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         "key_string",
     ],

src/mongo/db/storage/wiredtiger/BUILD.bazel

@@ -216,7 +216,7 @@ mongo_cc_unit_test(
         "wiredtiger_stats_test.cpp",
         "wiredtiger_util_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":storage_wiredtiger",
         ":storage_wiredtiger_core",
@@ -245,7 +245,7 @@ mongo_cc_unit_test(
         "wiredtiger_standard_index_test.cpp",
         "wiredtiger_standard_record_store_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":storage_wiredtiger_core",
         ":wiredtiger_index_test_harness",

src/mongo/db/timeseries/BUILD.bazel

@@ -257,7 +257,7 @@ mongo_cc_unit_test(
         "timeseries_update_delete_util_test.cpp",
         "timeseries_write_util_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":bucket_compression",
         ":timeseries_conversion_util",

src/mongo/db/timeseries/bucket_catalog/BUILD.bazel

@@ -68,7 +68,7 @@ mongo_cc_unit_test(
         "minmax_test.cpp",
         "schema_test.cpp",
     ],
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":bucket_catalog",
         "//src/mongo/db:dbdirectclient",
@@ -87,7 +87,7 @@ mongo_cc_unit_test(
     srcs = [
         "timeseries_sizing_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         ":bucket_catalog",
     ],

src/mongo/db/timeseries/write_ops/BUILD.bazel

@@ -95,7 +95,7 @@ mongo_cc_unit_test(
     srcs = [
         "timeseries_write_ops_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         "//src/mongo/db/catalog:catalog_test_fixture",
         "//src/mongo/db/collection_crud",

src/mongo/db/timeseries/write_ops/internal/BUILD.bazel

@@ -37,7 +37,7 @@ mongo_cc_unit_test(
     srcs = [
         "timeseries_write_ops_internal_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         "//src/mongo/db/catalog:catalog_test_fixture",
         "//src/mongo/db/collection_crud",

src/mongo/db/transaction/BUILD.bazel

@@ -137,7 +137,7 @@ mongo_cc_unit_test(
     ],
     tags = [
         "compile_requires_large_memory_gcc",
-        "mongo_unittest_fourth_group",
+        "mongo_unittest_eighth_group",
     ],
     deps = [
         ":transaction",

src/mongo/db/ttl/BUILD.bazel

@@ -62,9 +62,7 @@ mongo_cc_unit_test(
         "ttl_collection_cache_test.cpp",
         "ttl_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_third_group",
-    ],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":ttl_collection_cache",
         ":ttl_d",

src/mongo/db/update/BUILD.bazel

@@ -230,9 +230,7 @@ mongo_cc_unit_test(
         "v2_log_builder_test.cpp",
         "//src/mongo/db/update:update_node_test_fixture.h",
     ],
-    tags = [
-        "mongo_unittest_third_group",
-    ],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":update",
         ":update_common",

src/mongo/db/views/BUILD.bazel

@@ -82,9 +82,7 @@ mongo_cc_unit_test(
         "view_definition_test.cpp",
         "view_graph_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_third_group",
-    ],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":view_catalog_helpers",
         ":views",

src/mongo/embedded/stitch_support/BUILD.bazel

@@ -74,7 +74,7 @@ mongo_cc_unit_test(
     ],
     has_custom_mainline = True,
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_third_group",
         "stitch_support_test",
     ],
     target_compatible_with = select({

src/mongo/executor/BUILD.bazel

@@ -621,7 +621,7 @@ mongo_cc_unit_test(
     ],
     tags = [
         "compile_requires_large_memory_gcc_fission",
-        "mongo_unittest_third_group",
+        "mongo_unittest_fifth_group",
     ],
     deps = [
         "async_rpc",
@@ -663,7 +663,7 @@ mongo_cc_unit_test(
         "//src/mongo/util:executor_test_util.h",
     ],
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_fourth_group",
         "server-programmability",
     ],
     deps = [

src/mongo/idl/BUILD.bazel

@@ -263,9 +263,7 @@ mongo_cc_unit_test(
         "cluster_server_parameter_test_util.h",
         ":cluster_server_parameter_test_gen",
     ],
-    tags = [
-        "mongo_unittest_second_group",
-    ],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":cluster_parameter_synchronization_helpers",
         ":cluster_server_parameter",
@@ -319,7 +317,7 @@ mongo_cc_unit_test(
         "//src/mongo/util/cmdline_utils:censor_cmdline_test.h",
     ],
     tags = [
-        "mongo_unittest_third_group",
+        "mongo_unittest_fifth_group",
         "server-programmability",
     ],
     deps = [

src/mongo/logv2/BUILD.bazel

@@ -35,9 +35,7 @@ mongo_cc_unit_test(
         "logv2_test.cpp",
         "redaction_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_first_group",
-    ],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         "//src/mongo/db/auth:security_token",
         "//src/mongo/db/commands:core",

src/mongo/platform/BUILD.bazel

@@ -71,7 +71,7 @@ mongo_cc_unit_test(
     ],
     has_custom_mainline = True,
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_third_group",
         "server-programmability",
     ],
     deps = [
@@ -115,7 +115,7 @@ mongo_cc_unit_test(
         "//src/mongo/unittest:join_thread.h",
     ],
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_fourth_group",
         "server-programmability",
     ],
 )
@@ -127,7 +127,7 @@ mongo_cc_unit_test(
         "//src/mongo/unittest:join_thread.h",
     ],
     tags = [
-        "mongo_unittest_third_group",
+        "mongo_unittest_sixth_group",
         "server-programmability",
     ],
     deps = [
@@ -139,7 +139,7 @@ mongo_cc_unit_test(
     name = "throw_hook_test",
     srcs = ["throw_hook_test.cpp"],
     tags = [
-        "mongo_unittest_fourth_group",
+        "mongo_unittest_seventh_group",
         "server-programmability",
     ],
     target_compatible_with = select({

src/mongo/rpc/BUILD.bazel

@@ -239,9 +239,7 @@ mongo_cc_unit_test(
         "//src/mongo/rpc/metadata:repl_set_metadata_test.cpp",
         "//src/mongo/rpc/metadata:security_token_metadata_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_third_group",
-    ],
+    tags = ["mongo_unittest_fifth_group"],
     target_compatible_with = select({
         "//bazel/config:use_wiredtiger_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],

src/mongo/s/BUILD.bazel

@@ -1167,7 +1167,7 @@ mongo_cc_unit_test(
     tags = [
         "compile_requires_large_memory_gcc",
         "compile_requires_large_memory_sanitizer",
-        "mongo_unittest_third_group",
+        "mongo_unittest_sixth_group",
     ],
     deps = [
         ":load_balancer_support",
@@ -1205,9 +1205,7 @@ mongo_cc_unit_test(
     srcs = [
         "service_entry_point_router_role_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_second_group",
-    ],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":startup_initialization",
         "//src/mongo/db:service_context_non_d",
@@ -1240,9 +1238,7 @@ mongo_cc_unit_test(
     srcs = [
         "multi_statement_transaction_requests_sender_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_second_group",
-    ],
+    tags = ["mongo_unittest_third_group"],
     deps = [
         ":sharding_api",
         ":sharding_mongos_test_fixture",

src/mongo/s/commands/BUILD.bazel

@@ -373,9 +373,7 @@ mongo_cc_unit_test(
         "//src/mongo/s/commands/query_cmd:cluster_profile_cmd_test.cpp",
         "//src/mongo/s/commands/query_cmd:cluster_update_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_third_group",
-    ],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":cluster_commands",
         ":cluster_commands_common",

src/mongo/scripting/BUILD.bazel

@@ -249,7 +249,7 @@ mongo_cc_unit_test(
         "bson_template_evaluator_test.cpp",
         "deadline_monitor_test.cpp",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":scripting_common",
         "//src/mongo/db/concurrency:lock_manager",
@@ -282,7 +282,7 @@ mongo_cc_unit_test(
         "//bazel/config:spider_monkey_dbg_enabled": ["MONGO_SPIDERMONKEY_DBG"],
         "//conditions:default": [],
     }),
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     target_compatible_with = select({
         "//bazel/config:js_engine_mozjs": [],
         "//conditions:default": ["@platforms//:incompatible"],

src/mongo/shell/BUILD.bazel

@@ -545,6 +545,6 @@ mongo_cc_unit_test(
         "//bazel/config:ssl_enabled": ["kms_test.cpp"],
         "//conditions:default": [],
     }),
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = ["shell_test_dependencies"],
 )

src/mongo/stdx/BUILD.bazel

@@ -35,7 +35,7 @@ mongo_cc_unit_test(
         "unordered_map_test.cpp",
     ],
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_third_group",
         "server-programmability",
     ],
     deps = [],
@@ -47,7 +47,7 @@ mongo_cc_unit_test(
         "sigaltstack_location_test.cpp",
     ],
     has_custom_mainline = True,
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         "//src/mongo:base",
     ],
@@ -71,7 +71,7 @@ mongo_cc_unit_test(
         "set_terminate_from_main_die_in_thread_test.cpp",
     ],
     has_custom_mainline = True,
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         "//src/mongo:base",
     ],
@@ -83,7 +83,7 @@ mongo_cc_unit_test(
         "set_terminate_from_thread_die_in_main_test.cpp",
     ],
     has_custom_mainline = True,
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         "//src/mongo:base",
     ],
@@ -95,7 +95,7 @@ mongo_cc_unit_test(
         "set_terminate_from_thread_die_in_thread_test.cpp",
     ],
     has_custom_mainline = True,
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         "//src/mongo:base",
     ],

src/mongo/tools/workload_simulation/BUILD.bazel

@@ -69,7 +69,7 @@ mongo_cc_unit_test(
     srcs = [
         "workload_characteristics_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_sixth_group"],
     deps = [
         ":workload_characteristics",
         "//src/mongo/unittest",

src/mongo/tracing/BUILD.bazel

@@ -55,7 +55,7 @@ mongo_cc_unit_test(
         "-Isrc/third_party/opentelemetry-cpp/exporters/otlp/include",
         "-Isrc/third_party/opentelemetry-cpp/sdk/include",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     target_compatible_with = OTEL_TARGET_COMPATIBLE_WITH,
     deps = [
         ":tracing",

src/mongo/transport/BUILD.bazel

@@ -359,9 +359,7 @@ mongo_cc_unit_test(
         "//conditions:default": [],
     }),
     data = ["//jstests/libs:test_pem_files"],
-    tags = [
-        "mongo_unittest_second_group",
-    ],
+    tags = ["mongo_unittest_fourth_group"],
     deps = [
         ":message_compressor",
         ":message_compressor_options_server",

src/mongo/transport/grpc/BUILD.bazel

@@ -225,7 +225,7 @@ mongo_cc_unit_test(
     data = [
         "//jstests/libs:server_SAN.pem",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     target_compatible_with = GRPC_TARGET_COMPATIBLE_WITH,
     deps = [
         ":grpc_async_client_factory",

src/mongo/unittest/BUILD.bazel

@@ -190,7 +190,7 @@ mongo_cc_unit_test(
         "//src/mongo/unittest/expected_output/golden_self_test2:sanity_test2",
     ],
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_fourth_group",
         "server-programmability",
     ],
 )

src/mongo/util/BUILD.bazel

@@ -799,7 +799,7 @@ mongo_cc_unit_test(
     name = "concurrent_shared_values_map_test",
     srcs = ["concurrent_shared_values_map_test.cpp"],
     tags = [
-        "mongo_unittest_fourth_group",
+        "mongo_unittest_eighth_group",
         "server-programmability",
     ],
     deps = ["//src/mongo:base"],
@@ -810,7 +810,7 @@ mongo_cc_unit_test(
     srcs = [
         "tracing_support_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         ":tick_source_mock",
         "//src/mongo/util:clock_source_mock",
@@ -824,7 +824,7 @@ mongo_cc_unit_test(
         "thread_safety_context_test.cpp",
     ],
     tags = [
-        "mongo_unittest_fourth_group",
+        "mongo_unittest_eighth_group",
         "server-programmability",
     ],
     deps = [
@@ -862,7 +862,7 @@ mongo_cc_unit_test(
         "versioned_value_test.cpp",
     ],
     tags = [
-        "mongo_unittest_first_group",
+        "mongo_unittest_second_group",
         "server-programmability",
     ],
     deps = [
@@ -875,7 +875,7 @@ mongo_cc_unit_test(
     srcs = [
         "executor_stats_test.cpp",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         "//src/mongo/util:clock_source_mock",
         "//src/mongo/util:executor_stats",
@@ -895,7 +895,7 @@ mongo_cc_unit_test(
         "//bazel/config:tcmalloc_gperf_enabled": ["MONGO_HAVE_GPERFTOOLS_SIZE_CLASS_STATS"],
         "//conditions:default": [],
     }),
-    tags = ["mongo_unittest_second_group"],
+    tags = ["mongo_unittest_third_group"],
     target_compatible_with = select({
         "//bazel/config:tcmalloc_gperf_enabled": [],
         "//bazel/config:tcmalloc_google_enabled": [],
@@ -997,7 +997,7 @@ mongo_cc_unit_test(
     }),
     tags = [
         "compile_requires_large_memory_gcc_fission",
-        "mongo_unittest_second_group",
+        "mongo_unittest_fourth_group",
         "server-programmability",
         # Time functions seem to be incompatible with the sandbox
         "code_coverage_quarantine",
@@ -1185,7 +1185,7 @@ mongo_cc_unit_test(
         "ntservice_test.cpp",
         "perfctr_collect_test.cpp",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     target_compatible_with = select({
         "@platforms//os:windows": [],
         "//conditions:default": ["@platforms//:incompatible"],
@@ -1213,7 +1213,7 @@ mongo_cc_unit_test(
         "stacktrace_libunwind_test_functions.h",
     ],
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_fourth_group",
         "server-programmability",
     ],
     target_compatible_with = select({
@@ -1234,7 +1234,7 @@ mongo_cc_unit_test(
     #     "mongo_stacktrace_test_detail_testFunctionWithLinkage",
     # ],
     tags = [
-        "mongo_unittest_fourth_group",
+        "mongo_unittest_eighth_group",
         "server-programmability",
     ],
     deps = ["stacktrace_test_helpers"],

src/mongo/util/concurrency/BUILD.bazel

@@ -118,7 +118,7 @@ mongo_cc_unit_test(
         "with_lock_test.cpp",
     ],
     tags = [
-        "mongo_unittest_second_group",
+        "mongo_unittest_third_group",
         "server-programmability",
     ],
     deps = [
@@ -139,7 +139,7 @@ mongo_cc_unit_test(
         "lock_free_read_list_test.cpp",
         "//src/mongo/unittest:join_thread.h",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [],
 )
 
@@ -176,9 +176,7 @@ mongo_cc_unit_test(
     srcs = [
         "ticketholder_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_fourth_group",
-    ],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         "//src/mongo/db:service_context_non_d",
         "//src/mongo/db:service_context_test_fixture",

src/mongo/util/immutable/BUILD.bazel

@@ -24,7 +24,7 @@ mongo_cc_unit_test(
         "//src/mongo/util/immutable/details:memory_policy.h",
         "//src/mongo/util/immutable/details:set.h",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         "//src/mongo:base",
     ],

src/mongo/util/net/BUILD.bazel

@@ -407,7 +407,7 @@ mongo_cc_unit_test(
         "hostandport_test.cpp",
         "http_client_test.cpp",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     deps = [
         ":http_client",
         ":network",
@@ -427,7 +427,7 @@ mongo_cc_unit_test(
     data = [
         "//jstests/libs:test_pem_files",
     ],
-    tags = ["mongo_unittest_first_group"],
+    tags = ["mongo_unittest_second_group"],
     target_compatible_with = select({
         "//bazel/config:ssl_enabled": [],
         "//conditions:default": ["@platforms//:incompatible"],

src/mongo/util/tracing_profiler/BUILD.bazel

@@ -36,7 +36,7 @@ mongo_cc_unit_test(
         "//src/mongo/unittest/expected_output/golden_self_test:sanity_test",
         "//src/mongo/util/tracing_profiler/test_output/profiler_test_fixture:profiler_service_simple",
     ],
-    tags = ["mongo_unittest_third_group"],
+    tags = ["mongo_unittest_fifth_group"],
     deps = [
         ":tracing_profiler",
         "//src/mongo:base",

src/mongo/util/tracking/BUILD.bazel

@@ -32,9 +32,7 @@ mongo_cc_unit_test(
     srcs = [
         "tracking_allocator_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_fourth_group",
-    ],
+    tags = ["mongo_unittest_seventh_group"],
     deps = [
         "//src/mongo/db:service_context_test_fixture",
     ],

src/mongo/watchdog/BUILD.bazel

@@ -78,9 +78,7 @@ mongo_cc_unit_test(
     srcs = [
         "watchdog_test.cpp",
     ],
-    tags = [
-        "mongo_unittest_fourth_group",
-    ],
+    tags = ["mongo_unittest_eighth_group"],
     deps = [
         "watchdog",
         "//src/mongo/db:service_context_non_d",

src/third_party/IntelRDFPMathLib20U1/SConscript

@@ -150,7 +150,7 @@ readtest_wrapper_install = env.AutoInstall(
     AIB_COMPONENTS_EXTRA=[
         "unittests",
         "tests",
-        "first-quarter-unittests",
+        "first_group_unittests",
     ],
 )
 
@@ -170,7 +170,7 @@ if env.TargetOSIs('windows'):
         AIB_COMPONENTS_EXTRA=[
             "unittests",
             "tests",
-            "first-quarter-unittests",
+            "first_group_unittests",
         ],
     )
     env.RegisterTest("$UNITTEST_LIST", readtest_wrapper_bat_install[0])

src/third_party/grpc/BUILD.bazel

@@ -3492,7 +3492,7 @@ mongo_cc_unit_test(
         "-Isrc/third_party/grpc/dist/examples/protos",
         "-I$(BINDIR)/src/third_party/grpc/dist/examples/protos",
     ],
-    tags = ["mongo_unittest_fourth_group"],
+    tags = ["mongo_unittest_eighth_group"],
     target_compatible_with = GRPC_TARGET_COMPATIBLE_WITH,
     deps = [
         "grpc++_reflection",