SERVER-38818: Split tasks with dependencies

(cherry picked from commit 00728fb39267f5ca7c6bdc3bb69d2e445b5c3c29)

45 files changed, 175 insertions, 3664 deletions

diff --git a/buildscripts/client/evergreen.py b/buildscripts/client/evergreen.py
index c84ae3cdbf2..c13c4132871 100644
--- a/buildscripts/client/evergreen.py
+++ b/buildscripts/client/evergreen.py
@@ -144,6 +144,16 @@ class EvergreenApiV2(EvergreenApi):
         url = "{}/rest/v2/projects/{}/test_stats".format(self.api_server, project)
         return self._paginate(url, params)
 
+    def tasks_by_build_id(self, build_id):
+        """
+        Get a list of tasks for the given build.
+
+        :param build_id: Evergreen build to query.
+        :return: List of tasks.
+        """
+        url = "{}/rest/v2/builds/{}/tasks".format(self.api_server, build_id)
+        return self._call_api(url).json()
+
     def _call_api(self, url, params=None):
         start_time = time.time()
         response = self.session.get(url=url, params=params)
diff --git a/buildscripts/evergreen_generate_resmoke_tasks.py b/buildscripts/evergreen_generate_resmoke_tasks.py
index 729c81ecfe9..ce67292be94 100755
--- a/buildscripts/evergreen_generate_resmoke_tasks.py
+++ b/buildscripts/evergreen_generate_resmoke_tasks.py
@@ -13,6 +13,7 @@ import datetime
 import logging
 import math
 import os
+import re
 import sys
 from collections import defaultdict
 from collections import namedtuple
@@ -63,7 +64,7 @@ ConfigOptions = namedtuple("ConfigOptions", [
     "use_multiversion",
     "is_patch",
     "depends_on",
-    "requires",
+    "build_id",
 ])
 
 
@@ -125,13 +126,12 @@ def get_config_options(cmd_line_options, config_file):
     is_patch = read_config.get_config_value("is_patch", cmd_line_options, config_file_data)
     depends_on = split_if_exists(
         read_config.get_config_value("depends_on", cmd_line_options, config_file_data))
-    requires = split_if_exists(
-        read_config.get_config_value("requires", cmd_line_options, config_file_data))
+    build_id = read_config.get_config_value("build_id", cmd_line_options, config_file_data)
 
     return ConfigOptions(fallback_num_sub_suites, max_sub_suites, project, resmoke_args,
                          resmoke_jobs_max, target_resmoke_time, run_multiple_jobs, suite, task,
                          variant, use_large_distro, large_distro_name, use_multiversion, is_patch,
-                         depends_on, requires)
+                         depends_on, build_id)
 
 
 def divide_remaining_tests_among_suites(remaining_tests_runtimes, suites):
@@ -178,6 +178,33 @@ def divide_tests_into_suites(tests_runtimes, max_time_seconds, max_suites=None):
     return suites
 
 
+def update_suite_config(suite_config, roots=None, excludes=None):
+    """
+    Update suite config based on the roots and excludes passed in.
+
+    :param suite_config: suite_config to update.
+    :param roots: new roots to run, or None if roots should not be updated.
+    :param excludes: excludes to add, or None if excludes should not be include.
+    :return: updated suite_config
+    """
+    if roots:
+        suite_config['selector']['roots'] = roots
+
+    if excludes:
+        # This must be a misc file, if the exclude_files section exists, extend it, otherwise,
+        # create it.
+        if 'exclude_files' in suite_config['selector']:
+            suite_config['selector']['exclude_files'] += excludes
+        else:
+            suite_config['selector']['exclude_files'] = excludes
+    else:
+        # if excludes was not specified this must not a misc file, so don't exclude anything.
+        if 'exclude_files' in suite_config['selector']:
+            del suite_config['selector']['exclude_files']
+
+    return suite_config
+
+
 def generate_subsuite_file(source_suite_name, target_suite_name, roots=None, excludes=None):
     """
     Read and evaluate the yaml suite file.
@@ -191,13 +218,7 @@ def generate_subsuite_file(source_suite_name, target_suite_name, roots=None, exc
 
     with open(os.path.join(CONFIG_DIR, target_suite_name + ".yml"), 'w') as out:
         out.write(HEADER_TEMPLATE.format(file=__file__, suite_file=source_file))
-        if roots:
-            suite_config['selector']['roots'] = roots
-
-        if 'exclude_files' in suite_config['selector']:
-            del suite_config['selector']['exclude_files']
-        if excludes:
-            suite_config['selector']['exclude_files'] = excludes
+        suite_config = update_suite_config(suite_config, roots, excludes)
         out.write(yaml.dump(suite_config, default_flow_style=False, Dumper=yaml.SafeDumper))
 
 
@@ -223,13 +244,15 @@ def prepare_directory_for_suite(directory):
 class EvergreenConfigGenerator(object):
     """Generate evergreen configurations."""
 
-    def __init__(self, suites, options):
+    def __init__(self, suites, options, evg_api):
         """Create new EvergreenConfigGenerator object."""
         self.suites = suites
         self.options = options
+        self.evg_api = evg_api
         self.evg_config = Configuration()
         self.task_specs = []
         self.task_names = []
+        self.build_tasks = None
 
     def _set_task_distro(self, task_spec):
         if self.options.use_large_distro and self.options.large_distro_name:
@@ -260,16 +283,25 @@ class EvergreenConfigGenerator(object):
                 cmd_timeout.exec_timeout(int(math.ceil(expected_suite_runtime * 3)))
             commands.append(cmd_timeout.validate().resolve())
 
+    @staticmethod
+    def _is_task_dependency(task, possible_dependency):
+        return re.match('{0}_(\\d|misc)'.format(task), possible_dependency)
+
+    def _get_tasks_for_depends_on(self, dependent_task):
+        return [
+            str(task['display_name']) for task in self.build_tasks
+            if self._is_task_dependency(dependent_task, str(task['display_name']))
+        ]
+
     def _add_dependencies(self, task):
         task.dependency(TaskDependency("compile"))
         if not self.options.is_patch:
             # Don't worry about task dependencies in patch builds, only mainline.
             if self.options.depends_on:
                 for dep in self.options.depends_on:
-                    task.dependency(TaskDependency(dep))
-            if self.options.requires:
-                for dep in self.options.requires:
-                    task.requires(TaskDependency(dep))
+                    depends_on_tasks = self._get_tasks_for_depends_on(dep)
+                    for dependency in depends_on_tasks:
+                        task.dependency(TaskDependency(dependency))
 
         return task
 
@@ -321,6 +353,7 @@ class EvergreenConfigGenerator(object):
 
     def generate_config(self):
         """Generate evergreen configuration."""
+        self.build_tasks = self.evg_api.tasks_by_build_id(self.options.build_id)
         self._generate_variant()
         return self.evg_config
 
@@ -462,8 +495,6 @@ class Main(object):
         parser.add_argument("--is-patch", dest="is_patch", help="Is this part of a patch build.")
         parser.add_argument("--depends-on", dest="depends_on",
                             help="Generate depends on for these tasks.")
-        parser.add_argument("--requires", dest="requires",
-                            help="Generate requires for these tasks.")
         parser.add_argument("--verbose", dest="verbose", action="store_true", default=False,
                             help="Enable verbose logging.")
 
@@ -527,7 +558,8 @@ class Main(object):
 
     def write_evergreen_configuration(self, suites, task):
         """Generate the evergreen configuration for the new suite and write it to disk."""
-        evg_config = EvergreenConfigGenerator(suites, self.config_options).generate_config()
+        evg_config_gen = EvergreenConfigGenerator(suites, self.config_options, self.evergreen_api)
+        evg_config = evg_config_gen.generate_config()
 
         with open(os.path.join(CONFIG_DIR, task + ".json"), "w") as file_handle:
             file_handle.write(evg_config.to_json())
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_0.yml b/buildscripts/resmokeconfig/suites/sharding_auth_0.yml
deleted file mode 100644
index 5126e16bdaa..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_0.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   13 minutes to run on enterprise-rhel-62-64-bit
-  #   17 minutes to run on linux-64-debug
-  #   16 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/mongos_rs_shard_failure_tolerance.js
-  - jstests/sharding/top_chunk_autosplit.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_1.yml b/buildscripts/resmokeconfig/suites/sharding_auth_1.yml
deleted file mode 100644
index 4cf908b2f4e..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_1.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   12 minutes to run on enterprise-rhel-62-64-bit
-  #   14 minutes to run on linux-64-debug
-  #   15 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/zbigMapReduce.js
-  - jstests/sharding/remove2.js
-  - jstests/sharding/move_chunk_find_and_modify_with_write_retryability.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_10.yml b/buildscripts/resmokeconfig/suites/sharding_auth_10.yml
deleted file mode 100644
index 51241382c27..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_10.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   9 minutes to run on enterprise-rhel-62-64-bit
-  #   12 minutes to run on linux-64-debug
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/large_chunk.js
-  - jstests/sharding/zero_shard_version.js
-  - jstests/sharding/read_pref_multi_mongos_stale_config.js
-  - jstests/sharding/change_stream_read_preference.js
-  - jstests/sharding/explain_read_pref.js
-  - jstests/sharding/sort1.js
-  - jstests/sharding/migrateBig_balancer.js
-  - jstests/sharding/no_empty_reset.js
-  - jstests/sharding/mongos_does_not_gossip_logical_time_without_keys.js
-  - jstests/sharding/migrateBig.js
-  - jstests/sharding/lookup_change_stream_post_image_hashed_shard_key.js
-  - jstests/sharding/in_memory_sort_limit.js
-  - jstests/sharding/change_streams_unsharded_becomes_sharded.js
-  - jstests/sharding/read_committed_lookup.js
-  - jstests/sharding/write_commands_sharding_state.js
-  - jstests/sharding/geo_near_random1.js
-  - jstests/sharding/kill_pinned_cursor.js
-  - jstests/sharding/mapReduce_inSharded_outSharded.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_11.yml b/buildscripts/resmokeconfig/suites/sharding_auth_11.yml
deleted file mode 100644
index 4b02dd2fe42..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_11.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   9 minutes to run on enterprise-rhel-62-64-bit
-  #   11 minutes to run on linux-64-debug
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/diffservers1.js
-  - jstests/sharding/shard_targeting.js
-  - jstests/sharding/merge_chunks_test.js
-  - jstests/sharding/shard2.js
-  - jstests/sharding/prefix_shard_key.js
-  - jstests/sharding/features2.js
-  - jstests/sharding/shard_insert_getlasterror_w2.js
-  - jstests/sharding/group_slaveok.js
-  - jstests/sharding/names.js
-  - jstests/sharding/cursor_timeout.js
-  - jstests/sharding/mongos_validate_writes.js
-  - jstests/sharding/upsert_sharded.js
-  - jstests/sharding/empty_doc_results.js
-  - jstests/sharding/coll_epoch_test1.js
-  - jstests/sharding/lookup_change_stream_post_image_compound_shard_key.js
-  - jstests/sharding/explain_cmd.js
-  - jstests/sharding/secondary_shard_version_protocol_with_causal_consistency.js
-  - jstests/sharding/secondary_shard_versioning.js
-  - jstests/sharding/max_time_ms_sharded.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_12.yml b/buildscripts/resmokeconfig/suites/sharding_auth_12.yml
deleted file mode 100644
index efb6acdda36..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_12.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   8 minutes to run on enterprise-rhel-62-64-bit
-  #   11 minutes to run on linux-64-debug
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/mrShardedOutput.js
-  - jstests/sharding/large_skip_one_shard.js
-  - jstests/sharding/shard4.js
-  - jstests/sharding/count1.js
-  - jstests/sharding/count2.js
-  - jstests/sharding/hash_shard_num_chunks.js
-  - jstests/sharding/views.js
-  - jstests/sharding/exact_shard_key_target.js
-  - jstests/sharding/movePrimary1.js
-  - jstests/sharding/session_info_in_oplog.js
-  - jstests/sharding/validate_collection.js
-  - jstests/sharding/sharded_limit_batchsize.js
-  - jstests/sharding/allow_partial_results.js
-  - jstests/sharding/multi_write_target.js
-  - jstests/sharding/features1.js
-  - jstests/sharding/balancer_window.js
-  - jstests/sharding/query_config.js
-  - jstests/sharding/move_primary_clone_test.js
-  - jstests/sharding/resume_change_stream_from_stale_mongos.js
-  - jstests/sharding/update_sharded.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_13.yml b/buildscripts/resmokeconfig/suites/sharding_auth_13.yml
deleted file mode 100644
index 537002d99ed..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_13.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   9 minutes to run on enterprise-rhel-62-64-bit
-  #   12 minutes to run on linux-64-debug
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/resume_change_stream_on_subset_of_shards.js
-  - jstests/sharding/stats.js
-  - jstests/sharding/findandmodify1.js
-  - jstests/sharding/agg_project_limit_pipe_split.js
-  - jstests/sharding/multi_mongos2.js
-  - jstests/sharding/shard5.js
-  - jstests/sharding/advance_logical_time_with_valid_signature.js
-  - jstests/sharding/mapReduce_nonSharded.js
-  - jstests/sharding/change_streams.js
-  - jstests/sharding/retryable_writes.js
-  - jstests/sharding/hash_shard_non_empty.js
-  - jstests/sharding/cleanup_orphaned_basic.js
-  - jstests/sharding/lookup_change_stream_post_image_id_shard_key.js
-  - jstests/sharding/basic_sharding_params.js
-  - jstests/sharding/lagged_config_secondary.js
-  - jstests/sharding/features3.js
-  - jstests/sharding/pending_chunk.js
-  - jstests/sharding/geo_near_sharded.js
-  - jstests/sharding/cursor1.js
-  - jstests/sharding/addshard5.js
-  - jstests/sharding/limit_push.js
-  - jstests/sharding/agg_sort.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_14.yml b/buildscripts/resmokeconfig/suites/sharding_auth_14.yml
deleted file mode 100644
index 455bb1a5f7f..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_14.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   10 minutes to run on enterprise-rhel-62-64-bit
-  #   13 minutes to run on linux-64-debug
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/write_cmd_auto_split.js
-  - jstests/sharding/shard6.js
-  - jstests/sharding/index1.js
-  - jstests/sharding/migration_id_index.js
-  - jstests/sharding/change_streams_whole_db.js
-  - jstests/sharding/change_stream_enforce_max_time_ms_on_mongos.js
-  - jstests/sharding/unowned_doc_filtering.js
-  - jstests/sharding/causal_consistency_shell_support.js
-  - jstests/sharding/noUpdateButN1inAnotherCollection.js
-  - jstests/sharding/findandmodify2.js
-  - jstests/sharding/shard_aware_init_secondaries.js
-  - jstests/sharding/sharding_system_namespaces.js
-  - jstests/sharding/move_chunk_open_cursors.js
-  - jstests/sharding/cursor_cleanup.js
-  - jstests/sharding/cleanup_orphaned_cmd_hashed.js
-  - jstests/sharding/basic_split.js
-  - jstests/sharding/merge_chunks_test_with_md_ops.js
-  - jstests/sharding/find_getmore_cmd.js
-  - jstests/sharding/cleanup_orphaned_cmd_prereload.js
-  - jstests/sharding/cursor_valid_after_shard_stepdown.js
-  - jstests/sharding/trace_missing_docs_test.js
-  - jstests/sharding/key_string.js
-  - jstests/sharding/geo_near_sort.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_15.yml b/buildscripts/resmokeconfig/suites/sharding_auth_15.yml
deleted file mode 100644
index 3053ef9e52a..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_15.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   10 minutes to run on enterprise-rhel-62-64-bit
-  #   12 minutes to run on linux-64-debug
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/aggregations_in_session.js
-  - jstests/sharding/migration_failure.js
-  - jstests/sharding/multi_mongos2a.js
-  - jstests/sharding/change_streams_establishment_finds_new_shards.js
-  - jstests/sharding/inserts_consistent.js
-  - jstests/sharding/not_allowed_on_sharded_collection_cmd.js
-  - jstests/sharding/change_stream_metadata_notifications.js
-  - jstests/sharding/mapReduce_outSharded.js
-  - jstests/sharding/autosplit.js
-  - jstests/sharding/accurate_count_with_predicate.js
-  - jstests/sharding/remove3.js
-  - jstests/sharding/covered_shard_key_indexes.js
-  - jstests/sharding/basic_merge.js
-  - jstests/sharding/move_chunk_basic.js
-  - jstests/sharding/shard_key_immutable.js
-  - jstests/sharding/tag_auto_split.js
-  - jstests/sharding/tag_auto_split_partial_key.js
-  - jstests/sharding/write_transactions_during_migration.js
-  - jstests/sharding/time_zone_info_mongos.js
-  - jstests/sharding/addshard1.js
-  - jstests/sharding/basic_drop_coll.js
-  - jstests/sharding/enable_sharding_basic.js
-  - jstests/sharding/sharding_balance2.js
-  - jstests/sharding/merge_chunks_compound_shard_key.js
-  - jstests/sharding/remove1.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_16.yml b/buildscripts/resmokeconfig/suites/sharding_auth_16.yml
deleted file mode 100644
index 4fbca639884..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_16.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   10 minutes to run on enterprise-rhel-62-64-bit
-  #   12 minutes to run on linux-64-debug
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/shard_keycount.js
-  - jstests/sharding/move_primary_basic.js
-  - jstests/sharding/SERVER-7379.js
-  - jstests/sharding/idhack_sharded.js
-  - jstests/sharding/shard7.js
-  - jstests/sharding/presplit.js
-  - jstests/sharding/implicit_db_creation.js
-  - jstests/sharding/tag_range.js
-  - jstests/sharding/refresh_sessions.js
-  - jstests/sharding/mongos_no_detect_sharding.js
-  - jstests/sharding/conf_server_write_concern_metadata.js
-  - jstests/sharding/fts_score_sort_sharded.js
-  - jstests/sharding/addshard_idempotent.js
-  - jstests/sharding/movechunk_with_noMoveParanoia.js
-  - jstests/sharding/movechunk_with_default_paranoia.js
-  - jstests/sharding/after_cluster_time.js
-  - jstests/sharding/mr_noscripting.js
-  - jstests/sharding/clone_catalog_data.js
-  - jstests/sharding/migrate_overwrite_id.js
-  - jstests/sharding/movechunk_with_moveParanoia.js
-  - jstests/sharding/error_propagation.js
-  - jstests/sharding/shard1.js
-  - jstests/sharding/logical_time_metadata.js
-  - jstests/sharding/hash_shard_unique_compound.js
-  - jstests/sharding/crash_mongos_against_upgraded_cluster.js
-  - jstests/sharding/shard_existing.js
-  - jstests/sharding/create_idx_empty_primary.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_17.yml b/buildscripts/resmokeconfig/suites/sharding_auth_17.yml
deleted file mode 100644
index 7f0c7bf66bb..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_17.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   10 minutes to run on enterprise-rhel-62-64-bit
-  #   13 minutes to run on linux-64-debug
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/sharded_profile.js
-  - jstests/sharding/shard_with_special_db_names.js
-  - jstests/sharding/split_with_force_small.js
-  - jstests/sharding/explain_find_and_modify_sharded.js
-  - jstests/sharding/split_stale_mongos.js
-  - jstests/sharding/move_stale_mongos.js
-  - jstests/sharding/move_primary_with_test_flag.js
-  - jstests/sharding/move_chunk_missing_idx.js
-  - jstests/sharding/disable_autosplit.js
-  - jstests/sharding/move_primary_fcv_40.js
-  - jstests/sharding/oplog_document_key.js
-  - jstests/sharding/top_chunk_split.js
-  - jstests/sharding/movechunk_commit_changelog_stats.js
-  - jstests/sharding/change_stream_update_lookup_collation.js
-  - jstests/sharding/uuid_propagated_to_config_server_on_shardCollection.js
-  - jstests/sharding/use_rsm_data_for_cs.js
-  - jstests/sharding/shard_collection_verify_initial_chunks.js
-  - jstests/sharding/uuid_propagated_to_recipient_shard_on_recvChunkStart.js
-  - jstests/sharding/stale_version_write.js
-  - jstests/sharding/shard_aware_on_add_shard.js
-  - jstests/sharding/nonreplicated_uuids_on_shardservers.js
-  - jstests/sharding/operation_time_api.js
-  - jstests/sharding/logical_time_api.js
-  - jstests/sharding/coll_epoch_test0.js
-  - jstests/sharding/moveChunk_recipient_rejects_chunk_if_UUID_mismatch.js
-  - jstests/sharding/version1.js
-  - jstests/sharding/update_immutable_fields.js
-  - jstests/sharding/min_optime_recovery_on_successful_move_chunk_commit.js
-  - jstests/sharding/dump_coll_metadata.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_18.yml b/buildscripts/resmokeconfig/suites/sharding_auth_18.yml
deleted file mode 100644
index 30f95cbccfa..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_18.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   11 minutes to run on enterprise-rhel-62-64-bit
-  #   13 minutes to run on linux-64-debug
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/killop.js
-  - jstests/sharding/missing_key.js
-  - jstests/sharding/database_versioning_safe_secondary_reads.js
-  - jstests/sharding/split_large_key.js
-  - jstests/sharding/initial_split_validate_shard_collections.js
-  - jstests/sharding/replication_with_undefined_shard_key.js
-  - jstests/sharding/keys_rotation_interval_sec.js
-  - jstests/sharding/listshards.js
-  - jstests/sharding/change_stream_lookup_single_shard_cluster.js
-  - jstests/sharding/major_version_check.js
-  - jstests/sharding/max_time_ms_sharded_new_commands.js
-  - jstests/sharding/min_optime_recovery_on_failed_move_chunk_commit.js
-  - jstests/sharding/drop_configdb.js
-  - jstests/sharding/create_database.js
-  - jstests/sharding/sessions_collection_auto_healing.js
-  - jstests/sharding/rename_across_mongos.js
-  - jstests/sharding/conn_pool_stats.js
-  - jstests/sharding/shard_collection_cache_upgrade_downgrade.js
-  - jstests/sharding/autodiscover_config_rs_from_secondary.js
-  - jstests/sharding/mongos_query_comment.js
-  - jstests/sharding/listDatabases.js
-  - jstests/sharding/query_sharded.js
-  - jstests/sharding/printShardingStatus.js
-  - jstests/sharding/mongos_wait_csrs_initiate.js
-  - jstests/sharding/update_zone_key_range.js
-  - jstests/sharding/json_schema.js
-  - jstests/sharding/split_against_shard_with_invalid_split_points.js
-  - jstests/sharding/version2.js
-  - jstests/sharding/map_reduce_validation.js
-  - jstests/sharding/add_shard_to_zone.js
-  - jstests/sharding/remove_shard_from_zone.js
-  - jstests/sharding/arbiters_do_not_use_cluster_time.js
-  - jstests/sharding/balancer_shell_commands.js
-  - jstests/sharding/ssv_config_check.js
-  - jstests/sharding/hash_single_shard.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_19.yml b/buildscripts/resmokeconfig/suites/sharding_auth_19.yml
deleted file mode 100644
index 3ec9b318ee8..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_19.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   3 minutes to run on enterprise-rhel-62-64-bit
-  #   4 minutes to run on linux-64-debug
-  #   6 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/count_config_servers.js
-  - jstests/sharding/server_status.js
-  - jstests/sharding/database_versioning_upgrade_downgrade.js
-  - jstests/sharding/read_does_not_create_namespaces.js
-  - jstests/sharding/kill_op_overflow.js
-  - jstests/sharding/forget_mr_temp_ns.js
-  - jstests/sharding/mongos_local_explain.js
-  - jstests/sharding/ismaster.js
-  - jstests/sharding/empty_cluster_init.js
-  - jstests/sharding/addshard6.js
-  - jstests/sharding/read_after_optime.js
-  - jstests/sharding/sharding_options.js
-  - jstests/sharding/current_op_no_shards.js
-  - jstests/sharding/config_rs_change.js
-  - jstests/sharding/user_flags_sharded.js
-  - jstests/sharding/move_chunk_with_session_helper.js
-  - jstests/sharding/movechunk_include.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_2.yml b/buildscripts/resmokeconfig/suites/sharding_auth_2.yml
deleted file mode 100644
index d9345e7933b..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_2.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   13 minutes to run on enterprise-rhel-62-64-bit
-  #   16 minutes to run on linux-64-debug
-  #   17 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/batch_write_command_sharded.js
-  - jstests/sharding/config_rs_no_primary.js
-  - jstests/sharding/read_pref_cmd.js
-  - jstests/sharding/read_pref.js
-  - jstests/sharding/balance_repl.js
-  - jstests/sharding/primary_config_server_blackholed_from_mongos.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_3.yml b/buildscripts/resmokeconfig/suites/sharding_auth_3.yml
deleted file mode 100644
index 18caa7ca0fc..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_3.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   11 minutes to run on enterprise-rhel-62-64-bit
-  #   17 minutes to run on linux-64-debug
-  #   17 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/bulk_shard_insert.js
-  - jstests/sharding/commands_that_write_accept_wc_shards.js
-  - jstests/sharding/safe_secondary_reads_drop_recreate.js
-  - jstests/sharding/startup_with_all_configs_down.js
-  - jstests/sharding/enforce_zone_policy.js
-  - jstests/sharding/stale_mongos_updates_and_removes.js
-  - jstests/sharding/mr_and_agg_versioning.js
-  - jstests/sharding/rs_stepdown_and_pooling.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_4.yml b/buildscripts/resmokeconfig/suites/sharding_auth_4.yml
deleted file mode 100644
index 19981879881..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_4.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   11 minutes to run on enterprise-rhel-62-64-bit
-  #   14 minutes to run on linux-64-debug
-  #   16 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/drop_sharded_db.js
-  - jstests/sharding/all_config_servers_blackholed_from_mongos.js
-  - jstests/sharding/all_shard_and_config_hosts_brought_down_one_by_one.js
-  - jstests/sharding/sharding_rs2.js
-  - jstests/sharding/resume_change_stream.js
-  - jstests/sharding/commands_that_write_accept_wc_configRS.js
-  - jstests/sharding/shard_kill_and_pooling.js
-  - jstests/sharding/rename.js
-  - jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_5.yml b/buildscripts/resmokeconfig/suites/sharding_auth_5.yml
deleted file mode 100644
index 87610031000..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_5.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   11 minutes to run on enterprise-rhel-62-64-bit
-  #   15 minutes to run on linux-64-debug
-  #   18 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/delete_during_migrate.js
-  - jstests/sharding/sharding_rs1.js
-  - jstests/sharding/recovering_slaveok.js
-  - jstests/sharding/auto_rebalance_parallel_replica_sets.js
-  - jstests/sharding/sharding_balance3.js
-  - jstests/sharding/sharding_balance4.js
-  - jstests/sharding/mongos_shard_failure_tolerance.js
-  - jstests/sharding/convert_to_and_from_sharded.js
-  - jstests/sharding/query_after_multi_write.js
-  - jstests/sharding/find_and_modify_after_multi_write.js
-  - jstests/sharding/shard_collection_basic.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_6.yml b/buildscripts/resmokeconfig/suites/sharding_auth_6.yml
deleted file mode 100644
index f1e181ba88f..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_6.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   11 minutes to run on enterprise-rhel-62-64-bit
-  #   14 minutes to run on linux-64-debug
-  #   18 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/mongos_no_replica_set_refresh.js
-  - jstests/sharding/repl_monitor_refresh.js
-  - jstests/sharding/bouncing_count.js
-  - jstests/sharding/addshard4.js
-  - jstests/sharding/index_and_collection_option_propagation.js
-  - jstests/sharding/safe_secondary_reads_single_migration_suspend_range_deletion.js
-  - jstests/sharding/sharding_migrate_cursor1.js
-  - jstests/sharding/jumbo1.js
-  - jstests/sharding/database_and_shard_versioning_all_commands.js
-  - jstests/sharding/move_chunk_update_with_write_retryability.js
-  - jstests/sharding/shard_existing_coll_chunk_count.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_7.yml b/buildscripts/resmokeconfig/suites/sharding_auth_7.yml
deleted file mode 100644
index aa86f70d655..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_7.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   10 minutes to run on enterprise-rhel-62-64-bit
-  #   12 minutes to run on linux-64-debug
-  #   18 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/move_chunk_insert_with_write_retryability.js
-  - jstests/sharding/change_stream_update_lookup_read_concern.js
-  - jstests/sharding/move_chunk_remove_with_write_retryability.js
-  - jstests/sharding/addshard2.js
-  - jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js
-  - jstests/sharding/count_slaveok.js
-  - jstests/sharding/hash_shard1.js
-  - jstests/sharding/shard_identity_config_update.js
-  - jstests/sharding/shard_identity_rollback.js
-  - jstests/sharding/linearizable_read_concern.js
-  - jstests/sharding/return_partial_shards_down.js
-  - jstests/sharding/error_during_agg_getmore.js
-  - jstests/sharding/key_rotation.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_8.yml b/buildscripts/resmokeconfig/suites/sharding_auth_8.yml
deleted file mode 100644
index fa2d24eb2f6..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_8.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   10 minutes to run on enterprise-rhel-62-64-bit
-  #   13 minutes to run on linux-64-debug
-  #   18 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/sharding_multiple_ns_rs.js
-  - jstests/sharding/replmonitor_bad_seed.js
-  - jstests/sharding/test_stacked_migration_cleanup.js
-  - jstests/sharding/sharding_balance1.js
-  - jstests/sharding/shard_aware_primary_failover.js
-  - jstests/sharding/shard_aware_init.js
-  - jstests/sharding/autosplit_heuristics.js
-  - jstests/sharding/change_streams_primary_shard_unaware.js
-  - jstests/sharding/auto_rebalance_parallel.js
-  - jstests/sharding/view_rewrite.js
-  - jstests/sharding/change_stream_chunk_migration.js
-  - jstests/sharding/move_chunk_wc.js
-  - jstests/sharding/shard3.js
-  - jstests/sharding/autosplit_with_balancer.js
-  - jstests/sharding/multi_coll_drop.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_9.yml b/buildscripts/resmokeconfig/suites/sharding_auth_9.yml
deleted file mode 100644
index 8c97717cdfc..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_9.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   8 minutes to run on enterprise-rhel-62-64-bit
-  #   11 minutes to run on linux-64-debug
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/coll_epoch_test2.js
-  - jstests/sharding/cleanup_orphaned.js
-  - jstests/sharding/regex_targeting.js
-  - jstests/sharding/cleanup_orphaned_compound.js
-  - jstests/sharding/shards_and_config_return_last_committed_optime.js
-  - jstests/sharding/hash_basic.js
-  - jstests/sharding/bulk_insert.js
-  - jstests/sharding/array_shard_key.js
-  - jstests/sharding/geo_near_random2.js
-  - jstests/sharding/collation_targeting.js
-  - jstests/sharding/collation_targeting_inherited.js
-  - jstests/sharding/explain_agg_read_pref.js
-  - jstests/sharding/change_streams_shards_start_in_sync.js
-  - jstests/sharding/key_many.js
-  - jstests/sharding/mapReduce_inSharded.js
-  - jstests/sharding/mr_shard_version.js
-  - jstests/sharding/split_with_force.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_0.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_0.yml
deleted file mode 100644
index 003ebd5ffa1..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_0.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   13 minutes to run on enterprise-rhel-62-64-bit
-  #   16 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/mongos_rs_shard_failure_tolerance.js
-  - jstests/sharding/remove2.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_1.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_1.yml
deleted file mode 100644
index 6fcd41f4e6e..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_1.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   15 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/zbigMapReduce.js
-  - jstests/sharding/top_chunk_autosplit.js
-  - jstests/sharding/move_chunk_find_and_modify_with_write_retryability.js
-  - jstests/sharding/batch_write_command_sharded.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_10.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_10.yml
deleted file mode 100644
index 4c23420f30d..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_10.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   9 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/in_memory_sort_limit.js
-  - jstests/sharding/diffservers1.js
-  - jstests/sharding/shard_targeting.js
-  - jstests/sharding/change_streams_unsharded_becomes_sharded.js
-  - jstests/sharding/migrateBig.js
-  - jstests/sharding/geo_near_random1.js
-  - jstests/sharding/kill_pinned_cursor.js
-  - jstests/sharding/mapReduce_inSharded_outSharded.js
-  - jstests/sharding/shard_insert_getlasterror_w2.js
-  - jstests/sharding/names.js
-  - jstests/sharding/merge_chunks_test.js
-  - jstests/sharding/upsert_sharded.js
-  - jstests/sharding/shard2.js
-  - jstests/sharding/prefix_shard_key.js
-  - jstests/sharding/features2.js
-  - jstests/sharding/group_slaveok.js
-  - jstests/sharding/cursor_timeout.js
-  - jstests/sharding/mongos_validate_writes.js
-  - jstests/sharding/empty_doc_results.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_11.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_11.yml
deleted file mode 100644
index 620bfcd21dd..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_11.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   8 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/coll_epoch_test1.js
-  - jstests/sharding/lookup_change_stream_post_image_compound_shard_key.js
-  - jstests/sharding/explain_cmd.js
-  - jstests/sharding/secondary_shard_version_protocol_with_causal_consistency.js
-  - jstests/sharding/max_time_ms_sharded.js
-  - jstests/sharding/mrShardedOutput.js
-  - jstests/sharding/secondary_shard_versioning.js
-  - jstests/sharding/views.js
-  - jstests/sharding/session_info_in_oplog.js
-  - jstests/sharding/large_skip_one_shard.js
-  - jstests/sharding/shard4.js
-  - jstests/sharding/count1.js
-  - jstests/sharding/count2.js
-  - jstests/sharding/hash_shard_num_chunks.js
-  - jstests/sharding/features1.js
-  - jstests/sharding/exact_shard_key_target.js
-  - jstests/sharding/movePrimary1.js
-  - jstests/sharding/validate_collection.js
-  - jstests/sharding/move_primary_clone_test.js
-  - jstests/sharding/resume_change_stream_on_subset_of_shards.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_12.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_12.yml
deleted file mode 100644
index b80e0fc7915..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_12.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   9 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/sharded_limit_batchsize.js
-  - jstests/sharding/allow_partial_results.js
-  - jstests/sharding/multi_write_target.js
-  - jstests/sharding/balancer_window.js
-  - jstests/sharding/query_config.js
-  - jstests/sharding/resume_change_stream_from_stale_mongos.js
-  - jstests/sharding/update_sharded.js
-  - jstests/sharding/stats.js
-  - jstests/sharding/change_streams.js
-  - jstests/sharding/findandmodify1.js
-  - jstests/sharding/agg_project_limit_pipe_split.js
-  - jstests/sharding/multi_mongos2.js
-  - jstests/sharding/shard5.js
-  - jstests/sharding/mapReduce_nonSharded.js
-  - jstests/sharding/retryable_writes.js
-  - jstests/sharding/hash_shard_non_empty.js
-  - jstests/sharding/cleanup_orphaned_basic.js
-  - jstests/sharding/lookup_change_stream_post_image_id_shard_key.js
-  - jstests/sharding/basic_sharding_params.js
-  - jstests/sharding/write_cmd_auto_split.js
-  - jstests/sharding/shard6.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_13.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_13.yml
deleted file mode 100644
index 30287c2529a..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_13.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   9 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/lagged_config_secondary.js
-  - jstests/sharding/features3.js
-  - jstests/sharding/pending_chunk.js
-  - jstests/sharding/geo_near_sharded.js
-  - jstests/sharding/cursor1.js
-  - jstests/sharding/unowned_doc_filtering.js
-  - jstests/sharding/addshard5.js
-  - jstests/sharding/advance_logical_time_with_valid_signature.js
-  - jstests/sharding/limit_push.js
-  - jstests/sharding/agg_sort.js
-  - jstests/sharding/findandmodify2.js
-  - jstests/sharding/migration_id_index.js
-  - jstests/sharding/change_streams_whole_db.js
-  - jstests/sharding/change_stream_enforce_max_time_ms_on_mongos.js
-  - jstests/sharding/causal_consistency_shell_support.js
-  - jstests/sharding/move_chunk_open_cursors.js
-  - jstests/sharding/noUpdateButN1inAnotherCollection.js
-  - jstests/sharding/merge_chunks_test_with_md_ops.js
-  - jstests/sharding/shard_aware_init_secondaries.js
-  - jstests/sharding/cleanup_orphaned_cmd_prereload.js
-  - jstests/sharding/sharding_system_namespaces.js
-  - jstests/sharding/cursor_cleanup.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_14.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_14.yml
deleted file mode 100644
index fc092eb55f2..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_14.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   9 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/cleanup_orphaned_cmd_hashed.js
-  - jstests/sharding/basic_split.js
-  - jstests/sharding/find_getmore_cmd.js
-  - jstests/sharding/cursor_valid_after_shard_stepdown.js
-  - jstests/sharding/trace_missing_docs_test.js
-  - jstests/sharding/key_string.js
-  - jstests/sharding/index1.js
-  - jstests/sharding/geo_near_sort.js
-  - jstests/sharding/aggregations_in_session.js
-  - jstests/sharding/migration_failure.js
-  - jstests/sharding/mapReduce_outSharded.js
-  - jstests/sharding/multi_mongos2a.js
-  - jstests/sharding/accurate_count_with_predicate.js
-  - jstests/sharding/remove3.js
-  - jstests/sharding/change_streams_establishment_finds_new_shards.js
-  - jstests/sharding/inserts_consistent.js
-  - jstests/sharding/not_allowed_on_sharded_collection_cmd.js
-  - jstests/sharding/change_stream_metadata_notifications.js
-  - jstests/sharding/autosplit.js
-  - jstests/sharding/tag_auto_split.js
-  - jstests/sharding/covered_shard_key_indexes.js
-  - jstests/sharding/basic_merge.js
-  - jstests/sharding/move_chunk_basic.js
-  - jstests/sharding/shard_key_immutable.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_15.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_15.yml
deleted file mode 100644
index a0ea87b9ce0..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_15.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   10 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/tag_auto_split_partial_key.js
-  - jstests/sharding/shard_keycount.js
-  - jstests/sharding/write_transactions_during_migration.js
-  - jstests/sharding/move_primary_basic.js
-  - jstests/sharding/time_zone_info_mongos.js
-  - jstests/sharding/addshard1.js
-  - jstests/sharding/basic_drop_coll.js
-  - jstests/sharding/enable_sharding_basic.js
-  - jstests/sharding/sharding_balance2.js
-  - jstests/sharding/merge_chunks_compound_shard_key.js
-  - jstests/sharding/remove1.js
-  - jstests/sharding/SERVER-7379.js
-  - jstests/sharding/idhack_sharded.js
-  - jstests/sharding/shard7.js
-  - jstests/sharding/presplit.js
-  - jstests/sharding/implicit_db_creation.js
-  - jstests/sharding/tag_range.js
-  - jstests/sharding/refresh_sessions.js
-  - jstests/sharding/mongos_no_detect_sharding.js
-  - jstests/sharding/mr_noscripting.js
-  - jstests/sharding/conf_server_write_concern_metadata.js
-  - jstests/sharding/fts_score_sort_sharded.js
-  - jstests/sharding/addshard_idempotent.js
-  - jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js
-  - jstests/sharding/movechunk_with_noMoveParanoia.js
-  - jstests/sharding/movechunk_with_default_paranoia.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_16.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_16.yml
deleted file mode 100644
index 797d6fc3c26..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_16.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   10 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/after_cluster_time.js
-  - jstests/sharding/multi_coll_drop.js
-  - jstests/sharding/clone_catalog_data.js
-  - jstests/sharding/migrate_overwrite_id.js
-  - jstests/sharding/movechunk_with_moveParanoia.js
-  - jstests/sharding/error_propagation.js
-  - jstests/sharding/shard1.js
-  - jstests/sharding/move_stale_mongos.js
-  - jstests/sharding/logical_time_metadata.js
-  - jstests/sharding/move_chunk_missing_idx.js
-  - jstests/sharding/hash_shard_unique_compound.js
-  - jstests/sharding/crash_mongos_against_upgraded_cluster.js
-  - jstests/sharding/shard_existing.js
-  - jstests/sharding/create_idx_empty_primary.js
-  - jstests/sharding/sharded_profile.js
-  - jstests/sharding/shard_with_special_db_names.js
-  - jstests/sharding/split_with_force_small.js
-  - jstests/sharding/explain_find_and_modify_sharded.js
-  - jstests/sharding/split_stale_mongos.js
-  - jstests/sharding/move_primary_with_test_flag.js
-  - jstests/sharding/move_primary_fcv_40.js
-  - jstests/sharding/oplog_document_key.js
-  - jstests/sharding/top_chunk_split.js
-  - jstests/sharding/use_rsm_data_for_cs.js
-  - jstests/sharding/movechunk_commit_changelog_stats.js
-  - jstests/sharding/shard_collection_verify_initial_chunks.js
-  - jstests/sharding/change_stream_update_lookup_collation.js
-  - jstests/sharding/shard_aware_on_add_shard.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_17.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_17.yml
deleted file mode 100644
index c4a77be4ca3..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_17.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   11 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/uuid_propagated_to_config_server_on_shardCollection.js
-  - jstests/sharding/disable_autosplit.js
-  - jstests/sharding/coll_epoch_test0.js
-  - jstests/sharding/uuid_propagated_to_recipient_shard_on_recvChunkStart.js
-  - jstests/sharding/stale_version_write.js
-  - jstests/sharding/min_optime_recovery_on_successful_move_chunk_commit.js
-  - jstests/sharding/nonreplicated_uuids_on_shardservers.js
-  - jstests/sharding/operation_time_api.js
-  - jstests/sharding/logical_time_api.js
-  - jstests/sharding/moveChunk_recipient_rejects_chunk_if_UUID_mismatch.js
-  - jstests/sharding/version1.js
-  - jstests/sharding/update_immutable_fields.js
-  - jstests/sharding/listshards.js
-  - jstests/sharding/dump_coll_metadata.js
-  - jstests/sharding/killop.js
-  - jstests/sharding/missing_key.js
-  - jstests/sharding/database_versioning_safe_secondary_reads.js
-  - jstests/sharding/split_large_key.js
-  - jstests/sharding/initial_split_validate_shard_collections.js
-  - jstests/sharding/replication_with_undefined_shard_key.js
-  - jstests/sharding/keys_rotation_interval_sec.js
-  - jstests/sharding/change_stream_lookup_single_shard_cluster.js
-  - jstests/sharding/major_version_check.js
-  - jstests/sharding/sessions_collection_auto_healing.js
-  - jstests/sharding/max_time_ms_sharded_new_commands.js
-  - jstests/sharding/min_optime_recovery_on_failed_move_chunk_commit.js
-  - jstests/sharding/drop_configdb.js
-  - jstests/sharding/create_database.js
-  - jstests/sharding/mongos_query_comment.js
-  - jstests/sharding/rename_across_mongos.js
-  - jstests/sharding/conn_pool_stats.js
-  - jstests/sharding/shard_collection_cache_upgrade_downgrade.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_18.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_18.yml
deleted file mode 100644
index 1df76878e50..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_18.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   8 minutes to run on enterprise-rhel-62-64-bit
-  #   15 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/autodiscover_config_rs_from_secondary.js
-  - jstests/sharding/listDatabases.js
-  - jstests/sharding/query_sharded.js
-  - jstests/sharding/printShardingStatus.js
-  - jstests/sharding/mongos_wait_csrs_initiate.js
-  - jstests/sharding/update_zone_key_range.js
-  - jstests/sharding/json_schema.js
-  - jstests/sharding/split_against_shard_with_invalid_split_points.js
-  - jstests/sharding/map_reduce_validation.js
-  - jstests/sharding/add_shard_to_zone.js
-  - jstests/sharding/remove_shard_from_zone.js
-  - jstests/sharding/arbiters_do_not_use_cluster_time.js
-  - jstests/sharding/database_versioning_upgrade_downgrade.js
-  - jstests/sharding/balancer_shell_commands.js
-  - jstests/sharding/ssv_config_check.js
-  - jstests/sharding/version2.js
-  - jstests/sharding/hash_single_shard.js
-  - jstests/sharding/count_config_servers.js
-  - jstests/sharding/server_status.js
-  - jstests/sharding/read_does_not_create_namespaces.js
-  - jstests/sharding/kill_op_overflow.js
-  - jstests/sharding/mongos_local_explain.js
-  - jstests/sharding/ismaster.js
-  - jstests/sharding/forget_mr_temp_ns.js
-  - jstests/sharding/empty_cluster_init.js
-  - jstests/sharding/addshard6.js
-  - jstests/sharding/read_after_optime.js
-  - jstests/sharding/sharding_options.js
-  - jstests/sharding/config_rs_change.js
-  - jstests/sharding/current_op_no_shards.js
-  - jstests/sharding/user_flags_sharded.js
-  - jstests/sharding/move_chunk_with_session_helper.js
-  - jstests/sharding/movechunk_include.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_2.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_2.yml
deleted file mode 100644
index ea4ad2916e2..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_2.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   13 minutes to run on enterprise-rhel-62-64-bit
-  #   18 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/config_rs_no_primary.js
-  - jstests/sharding/read_pref.js
-  - jstests/sharding/read_pref_cmd.js
-  - jstests/sharding/primary_config_server_blackholed_from_mongos.js
-  - jstests/sharding/bulk_shard_insert.js
-  - jstests/sharding/startup_with_all_configs_down.js
-  - jstests/sharding/enforce_zone_policy.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_3.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_3.yml
deleted file mode 100644
index 3d9852f10fd..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_3.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   13 minutes to run on enterprise-rhel-62-64-bit
-  #   18 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/mr_and_agg_versioning.js
-  - jstests/sharding/rs_stepdown_and_pooling.js
-  - jstests/sharding/all_config_servers_blackholed_from_mongos.js
-  - jstests/sharding/all_shard_and_config_hosts_brought_down_one_by_one.js
-  - jstests/sharding/sharding_rs2.js
-  - jstests/sharding/resume_change_stream.js
-  - jstests/sharding/commands_that_write_accept_wc_configRS.js
-  - jstests/sharding/shard_kill_and_pooling.js
-  - jstests/sharding/safe_secondary_reads_drop_recreate.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_4.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_4.yml
deleted file mode 100644
index 9a5c78a6a6b..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_4.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   11 minutes to run on enterprise-rhel-62-64-bit
-  #   18 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/rename.js
-  - jstests/sharding/commands_that_write_accept_wc_shards.js
-  - jstests/sharding/auto_rebalance_parallel_replica_sets.js
-  - jstests/sharding/sharding_rs1.js
-  - jstests/sharding/recovering_slaveok.js
-  - jstests/sharding/sharding_balance3.js
-  - jstests/sharding/stale_mongos_updates_and_removes.js
-  - jstests/sharding/sharding_balance4.js
-  - jstests/sharding/convert_to_and_from_sharded.js
-  - jstests/sharding/mongos_shard_failure_tolerance.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_5.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_5.yml
deleted file mode 100644
index cc295f0a6e1..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_5.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   11 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/drop_sharded_db.js
-  - jstests/sharding/query_after_multi_write.js
-  - jstests/sharding/find_and_modify_after_multi_write.js
-  - jstests/sharding/mongos_no_replica_set_refresh.js
-  - jstests/sharding/bouncing_count.js
-  - jstests/sharding/repl_monitor_refresh.js
-  - jstests/sharding/addshard4.js
-  - jstests/sharding/index_and_collection_option_propagation.js
-  - jstests/sharding/safe_secondary_reads_single_migration_suspend_range_deletion.js
-  - jstests/sharding/sharding_migrate_cursor1.js
-  - jstests/sharding/move_chunk_update_with_write_retryability.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_6.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_6.yml
deleted file mode 100644
index 91faea9b99f..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_6.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   11 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/shard_existing_coll_chunk_count.js
-  - jstests/sharding/jumbo1.js
-  - jstests/sharding/database_and_shard_versioning_all_commands.js
-  - jstests/sharding/balance_repl.js
-  - jstests/sharding/move_chunk_insert_with_write_retryability.js
-  - jstests/sharding/addshard2.js
-  - jstests/sharding/change_stream_update_lookup_read_concern.js
-  - jstests/sharding/move_chunk_remove_with_write_retryability.js
-  - jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js
-  - jstests/sharding/shard_identity_config_update.js
-  - jstests/sharding/count_slaveok.js
-  - jstests/sharding/hash_shard1.js
-  - jstests/sharding/shard_identity_rollback.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_7.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_7.yml
deleted file mode 100644
index ab5b799cfee..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_7.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   10 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/delete_during_migrate.js
-  - jstests/sharding/return_partial_shards_down.js
-  - jstests/sharding/linearizable_read_concern.js
-  - jstests/sharding/key_rotation.js
-  - jstests/sharding/error_during_agg_getmore.js
-  - jstests/sharding/sharding_multiple_ns_rs.js
-  - jstests/sharding/replmonitor_bad_seed.js
-  - jstests/sharding/shard_aware_primary_failover.js
-  - jstests/sharding/shard_aware_init.js
-  - jstests/sharding/auto_rebalance_parallel.js
-  - jstests/sharding/autosplit_heuristics.js
-  - jstests/sharding/change_streams_primary_shard_unaware.js
-  - jstests/sharding/move_chunk_wc.js
-  - jstests/sharding/sharding_balance1.js
-  - jstests/sharding/test_stacked_migration_cleanup.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_8.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_8.yml
deleted file mode 100644
index 24117f8a9f3..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_8.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   8 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/view_rewrite.js
-  - jstests/sharding/autosplit_with_balancer.js
-  - jstests/sharding/change_stream_chunk_migration.js
-  - jstests/sharding/shard3.js
-  - jstests/sharding/coll_epoch_test2.js
-  - jstests/sharding/shard_collection_basic.js
-  - jstests/sharding/cleanup_orphaned.js
-  - jstests/sharding/regex_targeting.js
-  - jstests/sharding/cleanup_orphaned_compound.js
-  - jstests/sharding/shards_and_config_return_last_committed_optime.js
-  - jstests/sharding/hash_basic.js
-  - jstests/sharding/bulk_insert.js
-  - jstests/sharding/array_shard_key.js
-  - jstests/sharding/collation_targeting_inherited.js
-  - jstests/sharding/geo_near_random2.js
-  - jstests/sharding/collation_targeting.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_9.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_9.yml
deleted file mode 100644
index a3e87f5b657..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_9.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  # The following tests take approximately
-  #   9 minutes to run on enterprise-rhel-62-64-bit
-  #   19 minutes to run on enterprise-windows-64-2k8
-  roots:
-  - jstests/sharding/explain_agg_read_pref.js
-  - jstests/sharding/change_streams_shards_start_in_sync.js
-  - jstests/sharding/mr_shard_version.js
-  - jstests/sharding/key_many.js
-  - jstests/sharding/mapReduce_inSharded.js
-  - jstests/sharding/change_stream_read_preference.js
-  - jstests/sharding/sort1.js
-  - jstests/sharding/large_chunk.js
-  - jstests/sharding/zero_shard_version.js
-  - jstests/sharding/read_pref_multi_mongos_stale_config.js
-  - jstests/sharding/explain_read_pref.js
-  - jstests/sharding/migrateBig_balancer.js
-  - jstests/sharding/no_empty_reset.js
-  - jstests/sharding/split_with_force.js
-  - jstests/sharding/mongos_does_not_gossip_logical_time_without_keys.js
-  - jstests/sharding/read_committed_lookup.js
-  - jstests/sharding/write_commands_sharding_state.js
-  - jstests/sharding/lookup_change_stream_post_image_hashed_shard_key.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_misc.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_misc.yml
deleted file mode 100644
index 3f638d9da7b..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_misc.yml
+++ /dev/null
@@ -1,390 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to sharding_auth_audit.yml in order to ensure running the full test
-# suite locally matches the behavior of running parts of the test suite in Evergreen. It was
-# generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - 85a811117b9d0bfd6d3d147ce773e0abc5b0c8a2
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth_audit'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/sharding/*.js
-  exclude_files:
-  # Skip any tests that run with auth explicitly.
-  - jstests/sharding/*[aA]uth*.js
-  - jstests/sharding/advance_cluster_time_action_type.js
-  - jstests/sharding/aggregation_currentop.js # SERVER-19318
-  - jstests/sharding/kill_sessions.js
-  # Skip these additional tests when running with auth enabled.
-  - jstests/sharding/copydb_from_mongos.js  # SERVER-13080
-  - jstests/sharding/parallel.js
-  # Skip these tests that run with enableTestCommands off.
-  - jstests/sharding/shard_config_db_collections.js
-  # Skip the testcases that do not have auth bypass when running ops in parallel.
-  - jstests/sharding/cleanup_orphaned_cmd_during_movechunk.js         # SERVER-21713
-  - jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js  # SERVER-21713
-  - jstests/sharding/migration_with_source_ops.js                     # SERVER-21713
-  - jstests/sharding/migration_sets_fromMigrate_flag.js               # SERVER-21713
-  - jstests/sharding/migration_ignore_interrupts_1.js                 # SERVER-21713
-  - jstests/sharding/migration_ignore_interrupts_2.js                 # SERVER-21713
-  - jstests/sharding/migration_ignore_interrupts_3.js                 # SERVER-21713
-  - jstests/sharding/migration_ignore_interrupts_4.js                 # SERVER-21713
-  - jstests/sharding/movechunk_interrupt_at_primary_stepdown.js       # SERVER-21713
-  - jstests/sharding/movechunk_parallel.js                            # SERVER-21713
-  - jstests/sharding/migration_server_status.js                       # SERVER-21713
-  - jstests/sharding/migration_move_chunk_after_receive.js            # SERVER-21713
-  - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
-  # Runs with auth enabled.
-  - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
-  - jstests/sharding/mongos_rs_shard_failure_tolerance.js
-  - jstests/sharding/remove2.js
-  - jstests/sharding/zbigMapReduce.js
-  - jstests/sharding/top_chunk_autosplit.js
-  - jstests/sharding/move_chunk_find_and_modify_with_write_retryability.js
-  - jstests/sharding/batch_write_command_sharded.js
-  - jstests/sharding/config_rs_no_primary.js
-  - jstests/sharding/read_pref.js
-  - jstests/sharding/read_pref_cmd.js
-  - jstests/sharding/primary_config_server_blackholed_from_mongos.js
-  - jstests/sharding/bulk_shard_insert.js
-  - jstests/sharding/startup_with_all_configs_down.js
-  - jstests/sharding/enforce_zone_policy.js
-  - jstests/sharding/mr_and_agg_versioning.js
-  - jstests/sharding/rs_stepdown_and_pooling.js
-  - jstests/sharding/all_config_servers_blackholed_from_mongos.js
-  - jstests/sharding/all_shard_and_config_hosts_brought_down_one_by_one.js
-  - jstests/sharding/sharding_rs2.js
-  - jstests/sharding/resume_change_stream.js
-  - jstests/sharding/commands_that_write_accept_wc_configRS.js
-  - jstests/sharding/shard_kill_and_pooling.js
-  - jstests/sharding/safe_secondary_reads_drop_recreate.js
-  - jstests/sharding/rename.js
-  - jstests/sharding/commands_that_write_accept_wc_shards.js
-  - jstests/sharding/auto_rebalance_parallel_replica_sets.js
-  - jstests/sharding/sharding_rs1.js
-  - jstests/sharding/recovering_slaveok.js
-  - jstests/sharding/sharding_balance3.js
-  - jstests/sharding/stale_mongos_updates_and_removes.js
-  - jstests/sharding/sharding_balance4.js
-  - jstests/sharding/convert_to_and_from_sharded.js
-  - jstests/sharding/mongos_shard_failure_tolerance.js
-  - jstests/sharding/drop_sharded_db.js
-  - jstests/sharding/query_after_multi_write.js
-  - jstests/sharding/find_and_modify_after_multi_write.js
-  - jstests/sharding/mongos_no_replica_set_refresh.js
-  - jstests/sharding/bouncing_count.js
-  - jstests/sharding/repl_monitor_refresh.js
-  - jstests/sharding/addshard4.js
-  - jstests/sharding/index_and_collection_option_propagation.js
-  - jstests/sharding/safe_secondary_reads_single_migration_suspend_range_deletion.js
-  - jstests/sharding/sharding_migrate_cursor1.js
-  - jstests/sharding/move_chunk_update_with_write_retryability.js
-  - jstests/sharding/shard_existing_coll_chunk_count.js
-  - jstests/sharding/jumbo1.js
-  - jstests/sharding/database_and_shard_versioning_all_commands.js
-  - jstests/sharding/balance_repl.js
-  - jstests/sharding/move_chunk_insert_with_write_retryability.js
-  - jstests/sharding/addshard2.js
-  - jstests/sharding/change_stream_update_lookup_read_concern.js
-  - jstests/sharding/move_chunk_remove_with_write_retryability.js
-  - jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js
-  - jstests/sharding/shard_identity_config_update.js
-  - jstests/sharding/count_slaveok.js
-  - jstests/sharding/hash_shard1.js
-  - jstests/sharding/shard_identity_rollback.js
-  - jstests/sharding/delete_during_migrate.js
-  - jstests/sharding/return_partial_shards_down.js
-  - jstests/sharding/linearizable_read_concern.js
-  - jstests/sharding/key_rotation.js
-  - jstests/sharding/error_during_agg_getmore.js
-  - jstests/sharding/sharding_multiple_ns_rs.js
-  - jstests/sharding/replmonitor_bad_seed.js
-  - jstests/sharding/shard_aware_primary_failover.js
-  - jstests/sharding/shard_aware_init.js
-  - jstests/sharding/auto_rebalance_parallel.js
-  - jstests/sharding/autosplit_heuristics.js
-  - jstests/sharding/change_streams_primary_shard_unaware.js
-  - jstests/sharding/move_chunk_wc.js
-  - jstests/sharding/sharding_balance1.js
-  - jstests/sharding/test_stacked_migration_cleanup.js
-  - jstests/sharding/view_rewrite.js
-  - jstests/sharding/autosplit_with_balancer.js
-  - jstests/sharding/change_stream_chunk_migration.js
-  - jstests/sharding/shard3.js
-  - jstests/sharding/coll_epoch_test2.js
-  - jstests/sharding/shard_collection_basic.js
-  - jstests/sharding/cleanup_orphaned.js
-  - jstests/sharding/regex_targeting.js
-  - jstests/sharding/cleanup_orphaned_compound.js
-  - jstests/sharding/shards_and_config_return_last_committed_optime.js
-  - jstests/sharding/hash_basic.js
-  - jstests/sharding/bulk_insert.js
-  - jstests/sharding/array_shard_key.js
-  - jstests/sharding/collation_targeting_inherited.js
-  - jstests/sharding/geo_near_random2.js
-  - jstests/sharding/collation_targeting.js
-  - jstests/sharding/explain_agg_read_pref.js
-  - jstests/sharding/change_streams_shards_start_in_sync.js
-  - jstests/sharding/mr_shard_version.js
-  - jstests/sharding/key_many.js
-  - jstests/sharding/mapReduce_inSharded.js
-  - jstests/sharding/change_stream_read_preference.js
-  - jstests/sharding/sort1.js
-  - jstests/sharding/large_chunk.js
-  - jstests/sharding/zero_shard_version.js
-  - jstests/sharding/read_pref_multi_mongos_stale_config.js
-  - jstests/sharding/explain_read_pref.js
-  - jstests/sharding/migrateBig_balancer.js
-  - jstests/sharding/no_empty_reset.js
-  - jstests/sharding/split_with_force.js
-  - jstests/sharding/mongos_does_not_gossip_logical_time_without_keys.js
-  - jstests/sharding/read_committed_lookup.js
-  - jstests/sharding/write_commands_sharding_state.js
-  - jstests/sharding/lookup_change_stream_post_image_hashed_shard_key.js
-  - jstests/sharding/in_memory_sort_limit.js
-  - jstests/sharding/diffservers1.js
-  - jstests/sharding/shard_targeting.js
-  - jstests/sharding/change_streams_unsharded_becomes_sharded.js
-  - jstests/sharding/migrateBig.js
-  - jstests/sharding/geo_near_random1.js
-  - jstests/sharding/kill_pinned_cursor.js
-  - jstests/sharding/mapReduce_inSharded_outSharded.js
-  - jstests/sharding/shard_insert_getlasterror_w2.js
-  - jstests/sharding/names.js
-  - jstests/sharding/merge_chunks_test.js
-  - jstests/sharding/upsert_sharded.js
-  - jstests/sharding/shard2.js
-  - jstests/sharding/prefix_shard_key.js
-  - jstests/sharding/features2.js
-  - jstests/sharding/group_slaveok.js
-  - jstests/sharding/cursor_timeout.js
-  - jstests/sharding/mongos_validate_writes.js
-  - jstests/sharding/empty_doc_results.js
-  - jstests/sharding/coll_epoch_test1.js
-  - jstests/sharding/lookup_change_stream_post_image_compound_shard_key.js
-  - jstests/sharding/explain_cmd.js
-  - jstests/sharding/secondary_shard_version_protocol_with_causal_consistency.js
-  - jstests/sharding/max_time_ms_sharded.js
-  - jstests/sharding/mrShardedOutput.js
-  - jstests/sharding/secondary_shard_versioning.js
-  - jstests/sharding/views.js
-  - jstests/sharding/session_info_in_oplog.js
-  - jstests/sharding/large_skip_one_shard.js
-  - jstests/sharding/shard4.js
-  - jstests/sharding/count1.js
-  - jstests/sharding/count2.js
-  - jstests/sharding/hash_shard_num_chunks.js
-  - jstests/sharding/features1.js
-  - jstests/sharding/exact_shard_key_target.js
-  - jstests/sharding/movePrimary1.js
-  - jstests/sharding/validate_collection.js
-  - jstests/sharding/move_primary_clone_test.js
-  - jstests/sharding/resume_change_stream_on_subset_of_shards.js
-  - jstests/sharding/sharded_limit_batchsize.js
-  - jstests/sharding/allow_partial_results.js
-  - jstests/sharding/multi_write_target.js
-  - jstests/sharding/balancer_window.js
-  - jstests/sharding/query_config.js
-  - jstests/sharding/resume_change_stream_from_stale_mongos.js
-  - jstests/sharding/update_sharded.js
-  - jstests/sharding/stats.js
-  - jstests/sharding/change_streams.js
-  - jstests/sharding/findandmodify1.js
-  - jstests/sharding/agg_project_limit_pipe_split.js
-  - jstests/sharding/multi_mongos2.js
-  - jstests/sharding/shard5.js
-  - jstests/sharding/mapReduce_nonSharded.js
-  - jstests/sharding/retryable_writes.js
-  - jstests/sharding/hash_shard_non_empty.js
-  - jstests/sharding/cleanup_orphaned_basic.js
-  - jstests/sharding/lookup_change_stream_post_image_id_shard_key.js
-  - jstests/sharding/basic_sharding_params.js
-  - jstests/sharding/write_cmd_auto_split.js
-  - jstests/sharding/shard6.js
-  - jstests/sharding/lagged_config_secondary.js
-  - jstests/sharding/features3.js
-  - jstests/sharding/pending_chunk.js
-  - jstests/sharding/geo_near_sharded.js
-  - jstests/sharding/cursor1.js
-  - jstests/sharding/unowned_doc_filtering.js
-  - jstests/sharding/addshard5.js
-  - jstests/sharding/advance_logical_time_with_valid_signature.js
-  - jstests/sharding/limit_push.js
-  - jstests/sharding/agg_sort.js
-  - jstests/sharding/findandmodify2.js
-  - jstests/sharding/migration_id_index.js
-  - jstests/sharding/change_streams_whole_db.js
-  - jstests/sharding/change_stream_enforce_max_time_ms_on_mongos.js
-  - jstests/sharding/causal_consistency_shell_support.js
-  - jstests/sharding/move_chunk_open_cursors.js
-  - jstests/sharding/noUpdateButN1inAnotherCollection.js
-  - jstests/sharding/merge_chunks_test_with_md_ops.js
-  - jstests/sharding/shard_aware_init_secondaries.js
-  - jstests/sharding/cleanup_orphaned_cmd_prereload.js
-  - jstests/sharding/sharding_system_namespaces.js
-  - jstests/sharding/cursor_cleanup.js
-  - jstests/sharding/cleanup_orphaned_cmd_hashed.js
-  - jstests/sharding/basic_split.js
-  - jstests/sharding/find_getmore_cmd.js
-  - jstests/sharding/cursor_valid_after_shard_stepdown.js
-  - jstests/sharding/trace_missing_docs_test.js
-  - jstests/sharding/key_string.js
-  - jstests/sharding/index1.js
-  - jstests/sharding/geo_near_sort.js
-  - jstests/sharding/aggregations_in_session.js
-  - jstests/sharding/migration_failure.js
-  - jstests/sharding/mapReduce_outSharded.js
-  - jstests/sharding/multi_mongos2a.js
-  - jstests/sharding/accurate_count_with_predicate.js
-  - jstests/sharding/remove3.js
-  - jstests/sharding/change_streams_establishment_finds_new_shards.js
-  - jstests/sharding/inserts_consistent.js
-  - jstests/sharding/not_allowed_on_sharded_collection_cmd.js
-  - jstests/sharding/change_stream_metadata_notifications.js
-  - jstests/sharding/autosplit.js
-  - jstests/sharding/tag_auto_split.js
-  - jstests/sharding/covered_shard_key_indexes.js
-  - jstests/sharding/basic_merge.js
-  - jstests/sharding/move_chunk_basic.js
-  - jstests/sharding/shard_key_immutable.js
-  - jstests/sharding/tag_auto_split_partial_key.js
-  - jstests/sharding/shard_keycount.js
-  - jstests/sharding/write_transactions_during_migration.js
-  - jstests/sharding/move_primary_basic.js
-  - jstests/sharding/time_zone_info_mongos.js
-  - jstests/sharding/addshard1.js
-  - jstests/sharding/basic_drop_coll.js
-  - jstests/sharding/enable_sharding_basic.js
-  - jstests/sharding/sharding_balance2.js
-  - jstests/sharding/merge_chunks_compound_shard_key.js
-  - jstests/sharding/remove1.js
-  - jstests/sharding/SERVER-7379.js
-  - jstests/sharding/idhack_sharded.js
-  - jstests/sharding/shard7.js
-  - jstests/sharding/presplit.js
-  - jstests/sharding/implicit_db_creation.js
-  - jstests/sharding/tag_range.js
-  - jstests/sharding/refresh_sessions.js
-  - jstests/sharding/mongos_no_detect_sharding.js
-  - jstests/sharding/mr_noscripting.js
-  - jstests/sharding/conf_server_write_concern_metadata.js
-  - jstests/sharding/fts_score_sort_sharded.js
-  - jstests/sharding/addshard_idempotent.js
-  - jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js
-  - jstests/sharding/movechunk_with_noMoveParanoia.js
-  - jstests/sharding/movechunk_with_default_paranoia.js
-  - jstests/sharding/after_cluster_time.js
-  - jstests/sharding/multi_coll_drop.js
-  - jstests/sharding/clone_catalog_data.js
-  - jstests/sharding/migrate_overwrite_id.js
-  - jstests/sharding/movechunk_with_moveParanoia.js
-  - jstests/sharding/error_propagation.js
-  - jstests/sharding/shard1.js
-  - jstests/sharding/move_stale_mongos.js
-  - jstests/sharding/logical_time_metadata.js
-  - jstests/sharding/move_chunk_missing_idx.js
-  - jstests/sharding/hash_shard_unique_compound.js
-  - jstests/sharding/crash_mongos_against_upgraded_cluster.js
-  - jstests/sharding/shard_existing.js
-  - jstests/sharding/create_idx_empty_primary.js
-  - jstests/sharding/sharded_profile.js
-  - jstests/sharding/shard_with_special_db_names.js
-  - jstests/sharding/split_with_force_small.js
-  - jstests/sharding/explain_find_and_modify_sharded.js
-  - jstests/sharding/split_stale_mongos.js
-  - jstests/sharding/move_primary_with_test_flag.js
-  - jstests/sharding/move_primary_fcv_40.js
-  - jstests/sharding/oplog_document_key.js
-  - jstests/sharding/top_chunk_split.js
-  - jstests/sharding/use_rsm_data_for_cs.js
-  - jstests/sharding/movechunk_commit_changelog_stats.js
-  - jstests/sharding/shard_collection_verify_initial_chunks.js
-  - jstests/sharding/change_stream_update_lookup_collation.js
-  - jstests/sharding/shard_aware_on_add_shard.js
-  - jstests/sharding/uuid_propagated_to_config_server_on_shardCollection.js
-  - jstests/sharding/disable_autosplit.js
-  - jstests/sharding/coll_epoch_test0.js
-  - jstests/sharding/uuid_propagated_to_recipient_shard_on_recvChunkStart.js
-  - jstests/sharding/stale_version_write.js
-  - jstests/sharding/min_optime_recovery_on_successful_move_chunk_commit.js
-  - jstests/sharding/nonreplicated_uuids_on_shardservers.js
-  - jstests/sharding/operation_time_api.js
-  - jstests/sharding/logical_time_api.js
-  - jstests/sharding/moveChunk_recipient_rejects_chunk_if_UUID_mismatch.js
-  - jstests/sharding/version1.js
-  - jstests/sharding/update_immutable_fields.js
-  - jstests/sharding/listshards.js
-  - jstests/sharding/dump_coll_metadata.js
-  - jstests/sharding/killop.js
-  - jstests/sharding/missing_key.js
-  - jstests/sharding/database_versioning_safe_secondary_reads.js
-  - jstests/sharding/split_large_key.js
-  - jstests/sharding/initial_split_validate_shard_collections.js
-  - jstests/sharding/replication_with_undefined_shard_key.js
-  - jstests/sharding/keys_rotation_interval_sec.js
-  - jstests/sharding/change_stream_lookup_single_shard_cluster.js
-  - jstests/sharding/major_version_check.js
-  - jstests/sharding/sessions_collection_auto_healing.js
-  - jstests/sharding/max_time_ms_sharded_new_commands.js
-  - jstests/sharding/min_optime_recovery_on_failed_move_chunk_commit.js
-  - jstests/sharding/drop_configdb.js
-  - jstests/sharding/create_database.js
-  - jstests/sharding/mongos_query_comment.js
-  - jstests/sharding/rename_across_mongos.js
-  - jstests/sharding/conn_pool_stats.js
-  - jstests/sharding/shard_collection_cache_upgrade_downgrade.js
-  - jstests/sharding/autodiscover_config_rs_from_secondary.js
-  - jstests/sharding/listDatabases.js
-  - jstests/sharding/query_sharded.js
-  - jstests/sharding/printShardingStatus.js
-  - jstests/sharding/mongos_wait_csrs_initiate.js
-  - jstests/sharding/update_zone_key_range.js
-  - jstests/sharding/json_schema.js
-  - jstests/sharding/split_against_shard_with_invalid_split_points.js
-  - jstests/sharding/map_reduce_validation.js
-  - jstests/sharding/add_shard_to_zone.js
-  - jstests/sharding/remove_shard_from_zone.js
-  - jstests/sharding/arbiters_do_not_use_cluster_time.js
-  - jstests/sharding/database_versioning_upgrade_downgrade.js
-  - jstests/sharding/balancer_shell_commands.js
-  - jstests/sharding/ssv_config_check.js
-  - jstests/sharding/version2.js
-  - jstests/sharding/hash_single_shard.js
-  - jstests/sharding/count_config_servers.js
-  - jstests/sharding/server_status.js
-  - jstests/sharding/read_does_not_create_namespaces.js
-  - jstests/sharding/kill_op_overflow.js
-  - jstests/sharding/mongos_local_explain.js
-  - jstests/sharding/ismaster.js
-  - jstests/sharding/forget_mr_temp_ns.js
-  - jstests/sharding/empty_cluster_init.js
-  - jstests/sharding/addshard6.js
-  - jstests/sharding/read_after_optime.js
-  - jstests/sharding/sharding_options.js
-  - jstests/sharding/config_rs_change.js
-  - jstests/sharding/current_op_no_shards.js
-  - jstests/sharding/user_flags_sharded.js
-  - jstests/sharding/move_chunk_with_session_helper.js
-  - jstests/sharding/movechunk_include.js
-  # Enable when SERVER-36634 is fixed.
-  - jstests/sharding/shard_collection_existing_zones.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
\ No newline at end of file
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_misc.yml b/buildscripts/resmokeconfig/suites/sharding_auth_misc.yml
deleted file mode 100644
index 320eb11e17c..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_misc.yml
+++ /dev/null
@@ -1,388 +0,0 @@
-# This file was generated by buildscripts/generate_resmoke_suites.py and manual edits should also be
-# made to replica_sets_ese.yml in order to ensure running the full test suite locally matches the
-# behavior of running parts of the test suite in Evergreen. It was generated against commit range:
-#   2e31167d0e2cf179a228afeec71853cfb0f0683f - f4652f501d7b5642a1ad965bc8eefad7803bd120
-# with the following options:
-#   Namespace(branch='master', duration_days=14, end_commit=None, execution_time_minutes=20, owner='mongodb', project='mongo', start_commit=None, task=['sharding_auth'], variants='linux-64-debug,enterprise-rhel-62-64-bit,enterprise-windows-64-2k8', verbose=True)
-
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/sharding/*.js
-  exclude_files:
-  # Skip any tests that run with auth explicitly.
-  - jstests/sharding/*[aA]uth*.js
-  - jstests/sharding/advance_cluster_time_action_type.js
-  - jstests/sharding/aggregation_currentop.js # SERVER-19318
-  - jstests/sharding/kill_sessions.js
-  # Skip these additional tests when running with auth enabled.
-  - jstests/sharding/copydb_from_mongos.js  # SERVER-13080
-  - jstests/sharding/parallel.js
-  # Skip these tests that run with enableTestCommands off.
-  - jstests/sharding/shard_config_db_collections.js
-  # Skip the testcases that do not have auth bypass when running ops in parallel.
-  - jstests/sharding/cleanup_orphaned_cmd_during_movechunk.js         # SERVER-21713
-  - jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js  # SERVER-21713
-  - jstests/sharding/migration_ignore_interrupts_1.js                 # SERVER-21713
-  - jstests/sharding/migration_ignore_interrupts_2.js                 # SERVER-21713
-  - jstests/sharding/migration_ignore_interrupts_3.js                 # SERVER-21713
-  - jstests/sharding/migration_ignore_interrupts_4.js                 # SERVER-21713
-  - jstests/sharding/migration_move_chunk_after_receive.js            # SERVER-21713
-  - jstests/sharding/migration_server_status.js                       # SERVER-21713
-  - jstests/sharding/migration_sets_fromMigrate_flag.js               # SERVER-21713
-  - jstests/sharding/migration_with_source_ops.js                     # SERVER-21713
-  - jstests/sharding/movechunk_interrupt_at_primary_stepdown.js       # SERVER-21713
-  - jstests/sharding/movechunk_parallel.js                            # SERVER-21713
-  - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
-  # Runs with auth enabled.
-  - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
-  - jstests/sharding/mongos_rs_shard_failure_tolerance.js
-  - jstests/sharding/top_chunk_autosplit.js
-  - jstests/sharding/zbigMapReduce.js
-  - jstests/sharding/remove2.js
-  - jstests/sharding/move_chunk_find_and_modify_with_write_retryability.js
-  - jstests/sharding/batch_write_command_sharded.js
-  - jstests/sharding/config_rs_no_primary.js
-  - jstests/sharding/read_pref_cmd.js
-  - jstests/sharding/read_pref.js
-  - jstests/sharding/balance_repl.js
-  - jstests/sharding/primary_config_server_blackholed_from_mongos.js
-  - jstests/sharding/bulk_shard_insert.js
-  - jstests/sharding/commands_that_write_accept_wc_shards.js
-  - jstests/sharding/safe_secondary_reads_drop_recreate.js
-  - jstests/sharding/startup_with_all_configs_down.js
-  - jstests/sharding/enforce_zone_policy.js
-  - jstests/sharding/stale_mongos_updates_and_removes.js
-  - jstests/sharding/mr_and_agg_versioning.js
-  - jstests/sharding/rs_stepdown_and_pooling.js
-  - jstests/sharding/drop_sharded_db.js
-  - jstests/sharding/all_config_servers_blackholed_from_mongos.js
-  - jstests/sharding/all_shard_and_config_hosts_brought_down_one_by_one.js
-  - jstests/sharding/sharding_rs2.js
-  - jstests/sharding/resume_change_stream.js
-  - jstests/sharding/commands_that_write_accept_wc_configRS.js
-  - jstests/sharding/shard_kill_and_pooling.js
-  - jstests/sharding/rename.js
-  - jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js
-  - jstests/sharding/delete_during_migrate.js
-  - jstests/sharding/sharding_rs1.js
-  - jstests/sharding/recovering_slaveok.js
-  - jstests/sharding/auto_rebalance_parallel_replica_sets.js
-  - jstests/sharding/sharding_balance3.js
-  - jstests/sharding/sharding_balance4.js
-  - jstests/sharding/mongos_shard_failure_tolerance.js
-  - jstests/sharding/convert_to_and_from_sharded.js
-  - jstests/sharding/query_after_multi_write.js
-  - jstests/sharding/find_and_modify_after_multi_write.js
-  - jstests/sharding/shard_collection_basic.js
-  - jstests/sharding/mongos_no_replica_set_refresh.js
-  - jstests/sharding/repl_monitor_refresh.js
-  - jstests/sharding/bouncing_count.js
-  - jstests/sharding/addshard4.js
-  - jstests/sharding/index_and_collection_option_propagation.js
-  - jstests/sharding/safe_secondary_reads_single_migration_suspend_range_deletion.js
-  - jstests/sharding/sharding_migrate_cursor1.js
-  - jstests/sharding/jumbo1.js
-  - jstests/sharding/database_and_shard_versioning_all_commands.js
-  - jstests/sharding/move_chunk_update_with_write_retryability.js
-  - jstests/sharding/shard_existing_coll_chunk_count.js
-  - jstests/sharding/move_chunk_insert_with_write_retryability.js
-  - jstests/sharding/change_stream_update_lookup_read_concern.js
-  - jstests/sharding/move_chunk_remove_with_write_retryability.js
-  - jstests/sharding/addshard2.js
-  - jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js
-  - jstests/sharding/count_slaveok.js
-  - jstests/sharding/hash_shard1.js
-  - jstests/sharding/shard_identity_config_update.js
-  - jstests/sharding/shard_identity_rollback.js
-  - jstests/sharding/linearizable_read_concern.js
-  - jstests/sharding/return_partial_shards_down.js
-  - jstests/sharding/error_during_agg_getmore.js
-  - jstests/sharding/key_rotation.js
-  - jstests/sharding/sharding_multiple_ns_rs.js
-  - jstests/sharding/replmonitor_bad_seed.js
-  - jstests/sharding/test_stacked_migration_cleanup.js
-  - jstests/sharding/sharding_balance1.js
-  - jstests/sharding/shard_aware_primary_failover.js
-  - jstests/sharding/shard_aware_init.js
-  - jstests/sharding/autosplit_heuristics.js
-  - jstests/sharding/change_streams_primary_shard_unaware.js
-  - jstests/sharding/auto_rebalance_parallel.js
-  - jstests/sharding/view_rewrite.js
-  - jstests/sharding/change_stream_chunk_migration.js
-  - jstests/sharding/move_chunk_wc.js
-  - jstests/sharding/shard3.js
-  - jstests/sharding/autosplit_with_balancer.js
-  - jstests/sharding/multi_coll_drop.js
-  - jstests/sharding/coll_epoch_test2.js
-  - jstests/sharding/cleanup_orphaned.js
-  - jstests/sharding/regex_targeting.js
-  - jstests/sharding/cleanup_orphaned_compound.js
-  - jstests/sharding/shards_and_config_return_last_committed_optime.js
-  - jstests/sharding/hash_basic.js
-  - jstests/sharding/bulk_insert.js
-  - jstests/sharding/array_shard_key.js
-  - jstests/sharding/geo_near_random2.js
-  - jstests/sharding/collation_targeting.js
-  - jstests/sharding/collation_targeting_inherited.js
-  - jstests/sharding/explain_agg_read_pref.js
-  - jstests/sharding/change_streams_shards_start_in_sync.js
-  - jstests/sharding/key_many.js
-  - jstests/sharding/mapReduce_inSharded.js
-  - jstests/sharding/mr_shard_version.js
-  - jstests/sharding/split_with_force.js
-  - jstests/sharding/large_chunk.js
-  - jstests/sharding/zero_shard_version.js
-  - jstests/sharding/read_pref_multi_mongos_stale_config.js
-  - jstests/sharding/change_stream_read_preference.js
-  - jstests/sharding/explain_read_pref.js
-  - jstests/sharding/sort1.js
-  - jstests/sharding/migrateBig_balancer.js
-  - jstests/sharding/no_empty_reset.js
-  - jstests/sharding/mongos_does_not_gossip_logical_time_without_keys.js
-  - jstests/sharding/migrateBig.js
-  - jstests/sharding/lookup_change_stream_post_image_hashed_shard_key.js
-  - jstests/sharding/in_memory_sort_limit.js
-  - jstests/sharding/change_streams_unsharded_becomes_sharded.js
-  - jstests/sharding/read_committed_lookup.js
-  - jstests/sharding/write_commands_sharding_state.js
-  - jstests/sharding/geo_near_random1.js
-  - jstests/sharding/kill_pinned_cursor.js
-  - jstests/sharding/mapReduce_inSharded_outSharded.js
-  - jstests/sharding/diffservers1.js
-  - jstests/sharding/shard_targeting.js
-  - jstests/sharding/merge_chunks_test.js
-  - jstests/sharding/shard2.js
-  - jstests/sharding/prefix_shard_key.js
-  - jstests/sharding/features2.js
-  - jstests/sharding/shard_insert_getlasterror_w2.js
-  - jstests/sharding/group_slaveok.js
-  - jstests/sharding/names.js
-  - jstests/sharding/cursor_timeout.js
-  - jstests/sharding/mongos_validate_writes.js
-  - jstests/sharding/upsert_sharded.js
-  - jstests/sharding/empty_doc_results.js
-  - jstests/sharding/coll_epoch_test1.js
-  - jstests/sharding/lookup_change_stream_post_image_compound_shard_key.js
-  - jstests/sharding/explain_cmd.js
-  - jstests/sharding/secondary_shard_version_protocol_with_causal_consistency.js
-  - jstests/sharding/secondary_shard_versioning.js
-  - jstests/sharding/max_time_ms_sharded.js
-  - jstests/sharding/mrShardedOutput.js
-  - jstests/sharding/large_skip_one_shard.js
-  - jstests/sharding/shard4.js
-  - jstests/sharding/count1.js
-  - jstests/sharding/count2.js
-  - jstests/sharding/hash_shard_num_chunks.js
-  - jstests/sharding/views.js
-  - jstests/sharding/exact_shard_key_target.js
-  - jstests/sharding/movePrimary1.js
-  - jstests/sharding/session_info_in_oplog.js
-  - jstests/sharding/validate_collection.js
-  - jstests/sharding/sharded_limit_batchsize.js
-  - jstests/sharding/allow_partial_results.js
-  - jstests/sharding/multi_write_target.js
-  - jstests/sharding/features1.js
-  - jstests/sharding/balancer_window.js
-  - jstests/sharding/query_config.js
-  - jstests/sharding/move_primary_clone_test.js
-  - jstests/sharding/resume_change_stream_from_stale_mongos.js
-  - jstests/sharding/update_sharded.js
-  - jstests/sharding/resume_change_stream_on_subset_of_shards.js
-  - jstests/sharding/stats.js
-  - jstests/sharding/findandmodify1.js
-  - jstests/sharding/agg_project_limit_pipe_split.js
-  - jstests/sharding/multi_mongos2.js
-  - jstests/sharding/shard5.js
-  - jstests/sharding/advance_logical_time_with_valid_signature.js
-  - jstests/sharding/mapReduce_nonSharded.js
-  - jstests/sharding/change_streams.js
-  - jstests/sharding/retryable_writes.js
-  - jstests/sharding/hash_shard_non_empty.js
-  - jstests/sharding/cleanup_orphaned_basic.js
-  - jstests/sharding/lookup_change_stream_post_image_id_shard_key.js
-  - jstests/sharding/basic_sharding_params.js
-  - jstests/sharding/lagged_config_secondary.js
-  - jstests/sharding/features3.js
-  - jstests/sharding/pending_chunk.js
-  - jstests/sharding/geo_near_sharded.js
-  - jstests/sharding/cursor1.js
-  - jstests/sharding/addshard5.js
-  - jstests/sharding/limit_push.js
-  - jstests/sharding/agg_sort.js
-  - jstests/sharding/write_cmd_auto_split.js
-  - jstests/sharding/shard6.js
-  - jstests/sharding/index1.js
-  - jstests/sharding/migration_id_index.js
-  - jstests/sharding/change_streams_whole_db.js
-  - jstests/sharding/change_stream_enforce_max_time_ms_on_mongos.js
-  - jstests/sharding/unowned_doc_filtering.js
-  - jstests/sharding/causal_consistency_shell_support.js
-  - jstests/sharding/noUpdateButN1inAnotherCollection.js
-  - jstests/sharding/findandmodify2.js
-  - jstests/sharding/shard_aware_init_secondaries.js
-  - jstests/sharding/sharding_system_namespaces.js
-  - jstests/sharding/move_chunk_open_cursors.js
-  - jstests/sharding/cursor_cleanup.js
-  - jstests/sharding/cleanup_orphaned_cmd_hashed.js
-  - jstests/sharding/basic_split.js
-  - jstests/sharding/merge_chunks_test_with_md_ops.js
-  - jstests/sharding/find_getmore_cmd.js
-  - jstests/sharding/cleanup_orphaned_cmd_prereload.js
-  - jstests/sharding/cursor_valid_after_shard_stepdown.js
-  - jstests/sharding/trace_missing_docs_test.js
-  - jstests/sharding/key_string.js
-  - jstests/sharding/geo_near_sort.js
-  - jstests/sharding/aggregations_in_session.js
-  - jstests/sharding/migration_failure.js
-  - jstests/sharding/multi_mongos2a.js
-  - jstests/sharding/change_streams_establishment_finds_new_shards.js
-  - jstests/sharding/inserts_consistent.js
-  - jstests/sharding/not_allowed_on_sharded_collection_cmd.js
-  - jstests/sharding/change_stream_metadata_notifications.js
-  - jstests/sharding/mapReduce_outSharded.js
-  - jstests/sharding/autosplit.js
-  - jstests/sharding/accurate_count_with_predicate.js
-  - jstests/sharding/remove3.js
-  - jstests/sharding/covered_shard_key_indexes.js
-  - jstests/sharding/basic_merge.js
-  - jstests/sharding/move_chunk_basic.js
-  - jstests/sharding/shard_key_immutable.js
-  - jstests/sharding/tag_auto_split.js
-  - jstests/sharding/tag_auto_split_partial_key.js
-  - jstests/sharding/write_transactions_during_migration.js
-  - jstests/sharding/time_zone_info_mongos.js
-  - jstests/sharding/addshard1.js
-  - jstests/sharding/basic_drop_coll.js
-  - jstests/sharding/enable_sharding_basic.js
-  - jstests/sharding/sharding_balance2.js
-  - jstests/sharding/merge_chunks_compound_shard_key.js
-  - jstests/sharding/remove1.js
-  - jstests/sharding/shard_keycount.js
-  - jstests/sharding/move_primary_basic.js
-  - jstests/sharding/SERVER-7379.js
-  - jstests/sharding/idhack_sharded.js
-  - jstests/sharding/shard7.js
-  - jstests/sharding/presplit.js
-  - jstests/sharding/implicit_db_creation.js
-  - jstests/sharding/tag_range.js
-  - jstests/sharding/refresh_sessions.js
-  - jstests/sharding/mongos_no_detect_sharding.js
-  - jstests/sharding/conf_server_write_concern_metadata.js
-  - jstests/sharding/fts_score_sort_sharded.js
-  - jstests/sharding/addshard_idempotent.js
-  - jstests/sharding/movechunk_with_noMoveParanoia.js
-  - jstests/sharding/movechunk_with_default_paranoia.js
-  - jstests/sharding/after_cluster_time.js
-  - jstests/sharding/mr_noscripting.js
-  - jstests/sharding/clone_catalog_data.js
-  - jstests/sharding/migrate_overwrite_id.js
-  - jstests/sharding/movechunk_with_moveParanoia.js
-  - jstests/sharding/error_propagation.js
-  - jstests/sharding/shard1.js
-  - jstests/sharding/logical_time_metadata.js
-  - jstests/sharding/hash_shard_unique_compound.js
-  - jstests/sharding/crash_mongos_against_upgraded_cluster.js
-  - jstests/sharding/shard_existing.js
-  - jstests/sharding/create_idx_empty_primary.js
-  - jstests/sharding/sharded_profile.js
-  - jstests/sharding/shard_with_special_db_names.js
-  - jstests/sharding/split_with_force_small.js
-  - jstests/sharding/explain_find_and_modify_sharded.js
-  - jstests/sharding/split_stale_mongos.js
-  - jstests/sharding/move_stale_mongos.js
-  - jstests/sharding/move_primary_with_test_flag.js
-  - jstests/sharding/move_chunk_missing_idx.js
-  - jstests/sharding/disable_autosplit.js
-  - jstests/sharding/move_primary_fcv_40.js
-  - jstests/sharding/oplog_document_key.js
-  - jstests/sharding/top_chunk_split.js
-  - jstests/sharding/movechunk_commit_changelog_stats.js
-  - jstests/sharding/change_stream_update_lookup_collation.js
-  - jstests/sharding/uuid_propagated_to_config_server_on_shardCollection.js
-  - jstests/sharding/use_rsm_data_for_cs.js
-  - jstests/sharding/shard_collection_verify_initial_chunks.js
-  - jstests/sharding/uuid_propagated_to_recipient_shard_on_recvChunkStart.js
-  - jstests/sharding/stale_version_write.js
-  - jstests/sharding/shard_aware_on_add_shard.js
-  - jstests/sharding/nonreplicated_uuids_on_shardservers.js
-  - jstests/sharding/operation_time_api.js
-  - jstests/sharding/logical_time_api.js
-  - jstests/sharding/coll_epoch_test0.js
-  - jstests/sharding/moveChunk_recipient_rejects_chunk_if_UUID_mismatch.js
-  - jstests/sharding/version1.js
-  - jstests/sharding/update_immutable_fields.js
-  - jstests/sharding/min_optime_recovery_on_successful_move_chunk_commit.js
-  - jstests/sharding/dump_coll_metadata.js
-  - jstests/sharding/killop.js
-  - jstests/sharding/missing_key.js
-  - jstests/sharding/database_versioning_safe_secondary_reads.js
-  - jstests/sharding/split_large_key.js
-  - jstests/sharding/initial_split_validate_shard_collections.js
-  - jstests/sharding/replication_with_undefined_shard_key.js
-  - jstests/sharding/keys_rotation_interval_sec.js
-  - jstests/sharding/listshards.js
-  - jstests/sharding/change_stream_lookup_single_shard_cluster.js
-  - jstests/sharding/major_version_check.js
-  - jstests/sharding/max_time_ms_sharded_new_commands.js
-  - jstests/sharding/min_optime_recovery_on_failed_move_chunk_commit.js
-  - jstests/sharding/drop_configdb.js
-  - jstests/sharding/create_database.js
-  - jstests/sharding/sessions_collection_auto_healing.js
-  - jstests/sharding/rename_across_mongos.js
-  - jstests/sharding/conn_pool_stats.js
-  - jstests/sharding/shard_collection_cache_upgrade_downgrade.js
-  - jstests/sharding/autodiscover_config_rs_from_secondary.js
-  - jstests/sharding/mongos_query_comment.js
-  - jstests/sharding/listDatabases.js
-  - jstests/sharding/query_sharded.js
-  - jstests/sharding/printShardingStatus.js
-  - jstests/sharding/mongos_wait_csrs_initiate.js
-  - jstests/sharding/update_zone_key_range.js
-  - jstests/sharding/json_schema.js
-  - jstests/sharding/split_against_shard_with_invalid_split_points.js
-  - jstests/sharding/version2.js
-  - jstests/sharding/map_reduce_validation.js
-  - jstests/sharding/add_shard_to_zone.js
-  - jstests/sharding/remove_shard_from_zone.js
-  - jstests/sharding/arbiters_do_not_use_cluster_time.js
-  - jstests/sharding/balancer_shell_commands.js
-  - jstests/sharding/ssv_config_check.js
-  - jstests/sharding/hash_single_shard.js
-  - jstests/sharding/count_config_servers.js
-  - jstests/sharding/server_status.js
-  - jstests/sharding/database_versioning_upgrade_downgrade.js
-  - jstests/sharding/read_does_not_create_namespaces.js
-  - jstests/sharding/kill_op_overflow.js
-  - jstests/sharding/forget_mr_temp_ns.js
-  - jstests/sharding/mongos_local_explain.js
-  - jstests/sharding/ismaster.js
-  - jstests/sharding/empty_cluster_init.js
-  - jstests/sharding/addshard6.js
-  - jstests/sharding/read_after_optime.js
-  - jstests/sharding/sharding_options.js
-  - jstests/sharding/current_op_no_shards.js
-  - jstests/sharding/config_rs_change.js
-  - jstests/sharding/user_flags_sharded.js
-  - jstests/sharding/move_chunk_with_session_helper.js
-  - jstests/sharding/movechunk_include.js
-  # Enable when SERVER-36634 is fixed.
-  - jstests/sharding/shard_collection_existing_zones.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-1
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-      nodb: ''
-      readMode: commands
diff --git a/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py b/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py
index ccf33ca66e6..80024c2a996 100644
--- a/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py
+++ b/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py
@@ -16,7 +16,7 @@ from buildscripts import evergreen_generate_resmoke_tasks as grt
 from buildscripts.evergreen_generate_resmoke_tasks import render_suite, render_misc_suite, \
     prepare_directory_for_suite
 
-# pylint: disable=missing-docstring,invalid-name,unused-argument,no-self-use
+# pylint: disable=missing-docstring,invalid-name,unused-argument,no-self-use,protected-access
 
 _DATE = datetime.datetime(2018, 7, 15)
 
@@ -176,6 +176,34 @@ def create_suite(count=3, start=0):
     return suite
 
 
+class UpdateSuiteConfigTest(unittest.TestCase):
+    def test_roots_are_updated(self):
+        config = {'selector': {}}
+
+        updated_config = grt.update_suite_config(config, 'root value')
+        self.assertEqual('root value', updated_config['selector']['roots'])
+
+    def test_excluded_files_not_included_if_not_specified(self):
+        config = {'selector': {'excluded_files': 'files to exclude'}}
+
+        updated_config = grt.update_suite_config(config, excludes=None)
+        self.assertNotIn('exclude_files', updated_config['selector'])
+
+    def test_excluded_files_added_to_misc(self):
+        config = {'selector': {}}
+
+        updated_config = grt.update_suite_config(config, excludes='files to exclude')
+        self.assertEqual('files to exclude', updated_config['selector']['exclude_files'])
+
+    def test_excluded_files_extended_in_misc(self):
+        config = {'selector': {'exclude_files': ['file 0', 'file 1']}}
+
+        updated_config = grt.update_suite_config(config, excludes=['file 2', 'file 3'])
+        self.assertEqual(4, len(updated_config['selector']['exclude_files']))
+        for exclude in ['file 0', 'file 1', 'file 2', 'file 3']:
+            self.assertIn(exclude, updated_config['selector']['exclude_files'])
+
+
 class RenderSuites(unittest.TestCase):
     EXPECTED_FORMAT = """selector:
   excludes:
@@ -293,7 +321,7 @@ class EvergreenConfigGeneratorTest(unittest.TestCase):
         options = self.generate_mock_options()
         suites = self.generate_mock_suites(3)
 
-        config = grt.EvergreenConfigGenerator(suites, options).generate_config().to_map()
+        config = grt.EvergreenConfigGenerator(suites, options, Mock()).generate_config().to_map()
 
         self.assertEqual(len(config["tasks"]), len(suites) + 1)
         command1 = config["tasks"][0]["commands"][2]
@@ -306,7 +334,7 @@ class EvergreenConfigGeneratorTest(unittest.TestCase):
         options.task = "task"
         suites = self.generate_mock_suites(3)
 
-        config = grt.EvergreenConfigGenerator(suites, options).generate_config().to_map()
+        config = grt.EvergreenConfigGenerator(suites, options, Mock()).generate_config().to_map()
 
         self.assertEqual(len(config["tasks"]), len(suites) + 1)
         display_task = config["buildvariants"][0]["display_tasks"][0]
@@ -327,12 +355,64 @@ class EvergreenConfigGeneratorTest(unittest.TestCase):
 
         suites = self.generate_mock_suites(3)
 
-        config = grt.EvergreenConfigGenerator(suites, options).generate_config().to_map()
+        config = grt.EvergreenConfigGenerator(suites, options, Mock()).generate_config().to_map()
 
         self.assertEqual(len(config["tasks"]), len(suites) + 1)
         self.assertEqual(options.large_distro_name,
                          config["buildvariants"][0]["tasks"][0]["distros"][0])
 
+    def test_selecting_tasks(self):
+        is_task_dependency = grt.EvergreenConfigGenerator._is_task_dependency
+        self.assertFalse(is_task_dependency('sharding', 'sharding'))
+        self.assertFalse(is_task_dependency('sharding', 'other_task'))
+        self.assertFalse(is_task_dependency('sharding', 'sharding_gen'))
+
+        self.assertTrue(is_task_dependency('sharding', 'sharding_0'))
+        self.assertTrue(is_task_dependency('sharding', 'sharding_314'))
+        self.assertTrue(is_task_dependency('sharding', 'sharding_misc'))
+
+    def test_get_tasks_depends_on(self):
+        options = self.generate_mock_options()
+        suites = self.generate_mock_suites(3)
+
+        cfg_generator = grt.EvergreenConfigGenerator(suites, options, Mock())
+        cfg_generator.build_tasks = [
+            {'display_name': 'sharding_gen'},
+            {'display_name': 'sharding_0'},
+            {'display_name': 'other_task'},
+            {'display_name': 'other_task_2'},
+            {'display_name': 'sharding_1'},
+            {'display_name': 'compile'},
+            {'display_name': 'sharding_misc'},
+        ]
+
+        dependent_tasks = cfg_generator._get_tasks_for_depends_on('sharding')
+        self.assertEqual(3, len(dependent_tasks))
+        self.assertIn('sharding_0', dependent_tasks)
+        self.assertIn('sharding_1', dependent_tasks)
+        self.assertIn('sharding_misc', dependent_tasks)
+
+    def test_specified_dependencies_are_added(self):
+        options = self.generate_mock_options()
+        options.depends_on = ['sharding']
+        options.is_patch = False
+        suites = self.generate_mock_suites(3)
+
+        cfg_generator = grt.EvergreenConfigGenerator(suites, options, Mock())
+        cfg_generator.build_tasks = [
+            {'display_name': 'sharding_gen'},
+            {'display_name': 'sharding_0'},
+            {'display_name': 'other_task'},
+            {'display_name': 'other_task_2'},
+            {'display_name': 'sharding_1'},
+            {'display_name': 'compile'},
+            {'display_name': 'sharding_misc'},
+        ]
+
+        cfg_mock = Mock()
+        cfg_generator._add_dependencies(cfg_mock)
+        self.assertEqual(4, cfg_mock.dependency.call_count)
+
 
 class MainTest(unittest.TestCase):
     @staticmethod
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index ee12437a4e6..26edfe2ad5d 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -238,55 +238,6 @@ variables:
   - sharding_14
   - sharding_misc
 
-- &sharding_auth
-  name: sharding_auth
-  execution_tasks:
-  - sharding_auth_0
-  - sharding_auth_1
-  - sharding_auth_2
-  - sharding_auth_3
-  - sharding_auth_4
-  - sharding_auth_5
-  - sharding_auth_6
-  - sharding_auth_7
-  - sharding_auth_8
-  - sharding_auth_9
-  - sharding_auth_10
-  - sharding_auth_11
-  - sharding_auth_12
-  - sharding_auth_13
-  - sharding_auth_14
-  - sharding_auth_15
-  - sharding_auth_16
-  - sharding_auth_17
-  - sharding_auth_18
-  - sharding_auth_19
-  - sharding_auth_misc
-
-- &sharding_auth_audit
-  name: sharding_auth_audit
-  execution_tasks:
-  - sharding_auth_audit_0
-  - sharding_auth_audit_1
-  - sharding_auth_audit_2
-  - sharding_auth_audit_3
-  - sharding_auth_audit_4
-  - sharding_auth_audit_5
-  - sharding_auth_audit_6
-  - sharding_auth_audit_7
-  - sharding_auth_audit_8
-  - sharding_auth_audit_9
-  - sharding_auth_audit_10
-  - sharding_auth_audit_11
-  - sharding_auth_audit_12
-  - sharding_auth_audit_13
-  - sharding_auth_audit_14
-  - sharding_auth_audit_15
-  - sharding_auth_audit_16
-  - sharding_auth_audit_17
-  - sharding_auth_audit_18
-  - sharding_auth_audit_misc
-
 - &sharding_ese
   name: sharding_ese
   execution_tasks:
@@ -434,8 +385,6 @@ variables:
   - *dbtest
   - *replica_sets_auth
   - *replica_sets_ese
-  - *sharding_auth
-  - *sharding_auth_audit
   - *sharding_ese
   - *unittests
   expansions: &enterprise-windows-64-2k8-nopush-expansions-template
@@ -456,6 +405,7 @@ variables:
     tooltags: "ssl sasl"
     build_mongoreplay: false
     jstestfuzz_num_generated_files: 35
+    large_distro_name: windows-64-vs2017-compile
   tasks:
   - name: compile_all_run_unittests_TG
     requires:
@@ -516,129 +466,8 @@ variables:
   - name: replica_sets_ese_6
   - name: replica_sets_ese_misc
   - name: sasl
-  - name: sharding_auth_0
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_1
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_2
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_3
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_4
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_5
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_6
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_7
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_8
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_9
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_10
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_11
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_12
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_13
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_14
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_15
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_16
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_17
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_18
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_19
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_misc
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_0
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_1
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_2
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_3
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_4
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_5
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_6
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_7
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_8
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_9
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_10
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_11
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_12
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_13
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_14
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_15
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_16
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_17
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_18
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_misc
-    distros:
-    - windows-64-vs2015-large
+  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: sharding_ese_0
     distros:
     - windows-64-vs2015-large
@@ -1485,6 +1314,8 @@ functions:
           extra_args="$extra_args --tagFile=etc/test_retrial.yml"
         fi
 
+        resmoke_cmd_args="${resmoke_args}"
+
         # The "resmoke_wrapper" expansion is used by the 'burn_in_tests' task to wrap the resmoke.py
         # invocation. It doesn't set any environment variables and should therefore come last in
         # this list of expansions.
@@ -1499,7 +1330,7 @@ functions:
             ${snmp_config_path}                         \
             ${resmoke_wrapper}                          \
             $python buildscripts/evergreen_run_tests.py \
-                ${resmoke_args}                         \
+                $resmoke_cmd_args                       \
                 $extra_args                             \
                 ${test_flags}                           \
                 --log=buildlogger                       \
@@ -6191,7 +6022,6 @@ tasks:
       resmoke_args: --suites=sasl --storageEngine=wiredTiger
 
 - name: sharding_gen
-  depends_on: []
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6648,173 +6478,14 @@ tasks:
     vars:
       resmoke_args: --suites=sharding_auth --storageEngine=wiredTiger
 
-- <<: *task_template
-  name: sharding_auth_0
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_0 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_1
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_1 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_2
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_2 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_3
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_3 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_4
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_4 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_5
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_5 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_6
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_6 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_7
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_7 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_8
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_8 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_9
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_9 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_10
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_10 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_11
+- name: sharding_auth_gen
   commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_11 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_12
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_12 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_13
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_13 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_14
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_14 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_15
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_15 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_16
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_16 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_17
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_17 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_18
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_18 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_19
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_19 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_misc
-  commands:
-  - func: "do setup"
-  - func: "run tests"
+  - func: "generate resmoke tasks"
     vars:
-      resmoke_args: --suites=sharding_auth_misc --storageEngine=wiredTiger
+      task: sharding_auth
+      use_large_distro: "true"
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 20
 
 - <<: *task_template
   name: sharding_auth_audit
@@ -6826,206 +6497,17 @@ tasks:
     vars:
       resmoke_args: --suites=sharding_auth_audit --storageEngine=wiredTiger
 
-- <<: *task_template
-  name: sharding_auth_audit_0
-  depends_on: &sharding_auth_all
-  - name: sharding_auth_0
-  - name: sharding_auth_1
-  - name: sharding_auth_2
-  - name: sharding_auth_3
-  - name: sharding_auth_4
-  - name: sharding_auth_5
-  - name: sharding_auth_6
-  - name: sharding_auth_7
-  - name: sharding_auth_8
-  - name: sharding_auth_9
-  - name: sharding_auth_10
-  - name: sharding_auth_11
-  - name: sharding_auth_12
-  - name: sharding_auth_13
-  - name: sharding_auth_14
-  - name: sharding_auth_15
-  - name: sharding_auth_16
-  - name: sharding_auth_17
-  - name: sharding_auth_18
-  - name: sharding_auth_19
-  - name: sharding_auth_misc
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_0 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_1
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_1 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_2
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_2 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_3
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_3 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_4
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_4 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_5
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_5 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_6
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_6 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_7
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_7 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_8
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_8 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_9
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_9 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_10
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_10 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_11
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_11 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_12
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_12 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_13
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_13 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_14
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_14 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_15
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_15 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_16
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_16 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_17
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_17 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_18
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_18 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_misc
-  depends_on: *sharding_auth_all
+- name: sharding_auth_audit_gen
+  depends_on:
+  - name: sharding_auth_gen
   commands:
-  - func: "do setup"
-  - func: "run tests"
+  - func: "generate resmoke tasks"
     vars:
-      resmoke_args: --suites=sharding_auth_audit_misc --storageEngine=wiredTiger
+      task: sharding_auth_audit
+      depends_on: sharding_auth
+      use_large_distro: "true"
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 20
 
 - <<: *task_template
   name: sharding_last_stable_mongos_and_mixed_shards
@@ -8441,7 +7923,6 @@ buildvariants:
   - *dbtest
   - *replica_sets_auth
   - *sharding
-  - *sharding_auth
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
@@ -8549,27 +8030,7 @@ buildvariants:
   - name: sharding_13
   - name: sharding_14
   - name: sharding_misc
-  - name: sharding_auth_0
-  - name: sharding_auth_1
-  - name: sharding_auth_2
-  - name: sharding_auth_3
-  - name: sharding_auth_4
-  - name: sharding_auth_5
-  - name: sharding_auth_6
-  - name: sharding_auth_7
-  - name: sharding_auth_8
-  - name: sharding_auth_9
-  - name: sharding_auth_10
-  - name: sharding_auth_11
-  - name: sharding_auth_12
-  - name: sharding_auth_13
-  - name: sharding_auth_14
-  - name: sharding_auth_15
-  - name: sharding_auth_16
-  - name: sharding_auth_17
-  - name: sharding_auth_18
-  - name: sharding_auth_19
-  - name: sharding_auth_misc
+  - name: sharding_auth_gen
   - name: sharding_jscore_passthrough
   - name: sharding_jscore_op_query_passthrough
   - name: sharding_jscore_passthrough_wire_ops
@@ -9836,12 +9297,11 @@ buildvariants:
     tooltags: "ssl sasl"
     build_mongoreplay: false
     jstestfuzz_num_generated_files: 35
+    large_distro_name: windows-64-vs2017-compile
   display_tasks:
   - *dbtest
   - *replica_sets_auth
   - *replica_sets_ese
-  - *sharding_auth
-  - *sharding_auth_audit
   - *sharding_ese
   tasks:
   - name: compile_TG
@@ -9895,129 +9355,8 @@ buildvariants:
   - name: replica_sets_ese_misc
   - name: replica_sets_jscore_passthrough
   - name: sasl
-  - name: sharding_auth_0
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_1
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_2
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_3
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_4
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_5
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_6
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_7
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_8
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_9
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_10
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_11
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_12
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_13
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_14
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_15
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_16
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_17
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_18
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_19
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_misc
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_0
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_1
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_2
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_3
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_4
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_5
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_6
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_7
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_8
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_9
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_10
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_11
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_12
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_13
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_14
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_15
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_16
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_17
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_18
-    distros:
-    - windows-64-vs2015-large
-  - name: sharding_auth_audit_misc
-    distros:
-    - windows-64-vs2015-large
+  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: sharding_ese_0
     distros:
     - windows-64-vs2015-large
@@ -11058,8 +10397,6 @@ buildvariants:
   - *dbtest
   - *replica_sets_auth
   - *replica_sets_ese
-  - *sharding_auth
-  - *sharding_auth_audit
   - *sharding_ese
   - *sharding_last_stable_mongos_and_mixed_shards
   - *sharding_op_query
@@ -11279,129 +10616,8 @@ buildvariants:
   - name: session_jscore_passthrough
   - name: sharded_collections_jscore_passthrough
   - name: sharding_gen
-  - name: sharding_auth_0
-    distros:
-    - rhel62-large
-  - name: sharding_auth_1
-    distros:
-    - rhel62-large
-  - name: sharding_auth_2
-    distros:
-    - rhel62-large
-  - name: sharding_auth_3
-    distros:
-    - rhel62-large
-  - name: sharding_auth_4
-    distros:
-    - rhel62-large
-  - name: sharding_auth_5
-    distros:
-    - rhel62-large
-  - name: sharding_auth_6
-    distros:
-    - rhel62-large
-  - name: sharding_auth_7
-    distros:
-    - rhel62-large
-  - name: sharding_auth_8
-    distros:
-    - rhel62-large
-  - name: sharding_auth_9
-    distros:
-    - rhel62-large
-  - name: sharding_auth_10
-    distros:
-    - rhel62-large
-  - name: sharding_auth_11
-    distros:
-    - rhel62-large
-  - name: sharding_auth_12
-    distros:
-    - rhel62-large
-  - name: sharding_auth_13
-    distros:
-    - rhel62-large
-  - name: sharding_auth_14
-    distros:
-    - rhel62-large
-  - name: sharding_auth_15
-    distros:
-    - rhel62-large
-  - name: sharding_auth_16
-    distros:
-    - rhel62-large
-  - name: sharding_auth_17
-    distros:
-    - rhel62-large
-  - name: sharding_auth_18
-    distros:
-    - rhel62-large
-  - name: sharding_auth_19
-    distros:
-    - rhel62-large
-  - name: sharding_auth_misc
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_0
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_1
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_2
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_3
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_4
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_5
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_6
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_7
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_8
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_9
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_10
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_11
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_12
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_13
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_14
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_15
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_16
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_17
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_18
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_misc
-    distros:
-    - rhel62-large
+  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: sharding_ese_0
     distros:
     - rhel62-large
@@ -11589,13 +10805,12 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
+    large_distro_name: rhel62-large
   display_tasks:
   - *dbtest
   - *replica_sets_auth
   - *replica_sets_ese
   - *sharding
-  - *sharding_auth
-  - *sharding_auth_audit
   - *sharding_ese
   - *sharding_last_stable_mongos_and_mixed_shards
   - *sharding_op_query
@@ -11802,129 +11017,8 @@ buildvariants:
   - name: sharding_misc
     distros:
     - rhel62-large
-  - name: sharding_auth_0
-    distros:
-    - rhel62-large
-  - name: sharding_auth_1
-    distros:
-    - rhel62-large
-  - name: sharding_auth_2
-    distros:
-    - rhel62-large
-  - name: sharding_auth_3
-    distros:
-    - rhel62-large
-  - name: sharding_auth_4
-    distros:
-    - rhel62-large
-  - name: sharding_auth_5
-    distros:
-    - rhel62-large
-  - name: sharding_auth_6
-    distros:
-    - rhel62-large
-  - name: sharding_auth_7
-    distros:
-    - rhel62-large
-  - name: sharding_auth_8
-    distros:
-    - rhel62-large
-  - name: sharding_auth_9
-    distros:
-    - rhel62-large
-  - name: sharding_auth_10
-    distros:
-    - rhel62-large
-  - name: sharding_auth_11
-    distros:
-    - rhel62-large
-  - name: sharding_auth_12
-    distros:
-    - rhel62-large
-  - name: sharding_auth_13
-    distros:
-    - rhel62-large
-  - name: sharding_auth_14
-    distros:
-    - rhel62-large
-  - name: sharding_auth_15
-    distros:
-    - rhel62-large
-  - name: sharding_auth_16
-    distros:
-    - rhel62-large
-  - name: sharding_auth_17
-    distros:
-    - rhel62-large
-  - name: sharding_auth_18
-    distros:
-    - rhel62-large
-  - name: sharding_auth_19
-    distros:
-    - rhel62-large
-  - name: sharding_auth_misc
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_0
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_1
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_2
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_3
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_4
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_5
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_6
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_7
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_8
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_9
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_10
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_11
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_12
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_13
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_14
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_15
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_16
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_17
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_18
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_misc
-    distros:
-    - rhel62-large
+  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: sharding_ese_0
     distros:
     - rhel62-large