SERVER-60633 burn_in_tests should respect multiversion tags

9 files changed, 53 insertions, 209 deletions

diff --git a/buildscripts/tests/ciconfig/evergreen.yml b/buildscripts/tests/ciconfig/evergreen.yml
index cb20efc55ec..60fd7628959 100644
--- a/buildscripts/tests/ciconfig/evergreen.yml
+++ b/buildscripts/tests/ciconfig/evergreen.yml
@@ -104,6 +104,7 @@ tasks:
   commands:
     - func: "fetch source"
     - func: "run a task that passes"
+    - func: "run tests"
 
 - name: failing_test
   depends_on:
@@ -138,7 +139,7 @@ tasks:
     - func: "setup"
     - func: "run tests"
       vars:
-        resmoke_args: "--suites=somesuite --storageEngine=wiredTiger"
+        resmoke_args: "--storageEngine=wiredTiger"
 
 
 modules:
diff --git a/buildscripts/tests/ciconfig/test_evergreen.py b/buildscripts/tests/ciconfig/test_evergreen.py
index 051c2d7f76f..32a8cd330f3 100644
--- a/buildscripts/tests/ciconfig/test_evergreen.py
+++ b/buildscripts/tests/ciconfig/test_evergreen.py
@@ -84,50 +84,12 @@ class TestTask(unittest.TestCase):  # pylint: disable=too-many-public-methods
         self.assertEqual(task_dict, task.raw)
 
     def test_resmoke_args(self):
-        task_commands = [{"func": "run tests", "vars": {"resmoke_args": "--suites=core"}}]
-        task_dict = {"name": "jsCore", "commands": task_commands}
-        task = _evergreen.Task(task_dict)
-
-        self.assertEqual("--suites=core", task.resmoke_args)
-        self.assertEqual("core", task.resmoke_suite)
-
-    def test_resmoke_suite(self):
-        suite = "core"
-        task_dict = {
-            "name":
-                "jsCore", "commands": [{
-                    "func": "run tests", "vars": {"resmoke_args": "--suites={}".format(suite)}
-                }]
-        }
-        task = _evergreen.Task(task_dict)
-
-        self.assertEqual(suite, task.resmoke_suite)
-
-    def test_resmoke_suite_multiple(self):
-        task_dict = {
-            "name":
-                "jsCore", "commands": [{
-                    "func": "run tests",
-                    "vars": {"resmoke_args": "--suites=core --suites=core2--installDir=/bin"}
-                }]
-        }
+        suite_and_task = "jstestfuzz"
+        task_commands = [{"func": "run tests", "vars": {"resmoke_args": "--arg=val"}}]
+        task_dict = {"name": suite_and_task, "commands": task_commands}
         task = _evergreen.Task(task_dict)
 
-        with self.assertRaises(RuntimeError):
-            self.assertIsNone(task.resmoke_suite)
-
-    def test_resmoke_suite_with_comma(self):
-        task_dict = {
-            "name":
-                "jsCore", "commands": [{
-                    "func": "run tests",
-                    "vars": {"resmoke_args": "--suites=core,core2--installDir=/bin"}
-                }]
-        }
-        task = _evergreen.Task(task_dict)
-
-        with self.assertRaises(RuntimeError):
-            self.assertIsNone(task.resmoke_suite)
+        self.assertEqual(f"--suites={suite_and_task} --arg=val", task.resmoke_args)
 
     def test_is_run_tests_task(self):
         task_commands = [{"func": "run tests", "vars": {"resmoke_args": "--suites=core"}}]
@@ -170,7 +132,6 @@ class TestTask(unittest.TestCase):  # pylint: disable=too-many-public-methods
         task = _evergreen.Task(task_dict)
 
         self.assertEqual("--suites=jsCore --installDir=/bin", task.resmoke_args)
-        self.assertEqual("jsCore", task.resmoke_suite)
 
     def test_is_generate_resmoke_task(self):
         task_name = "core"
@@ -205,7 +166,6 @@ class TestTask(unittest.TestCase):  # pylint: disable=too-many-public-methods
         task = _evergreen.Task(task_dict)
 
         self.assertEqual("--suites=core --installDir=/bin", task.resmoke_args)
-        self.assertEqual("core", task.resmoke_suite)
 
     def test_tags_with_no_tags(self):
         task_dict = {
@@ -281,16 +241,16 @@ class TestTask(unittest.TestCase):  # pylint: disable=too-many-public-methods
         task_dict = {"name": task_name, "commands": task_commands}
         task = _evergreen.Task(task_dict)
 
-        self.assertEqual(suite_name, task.get_vars_suite_name(task_commands[0]["vars"]))
+        self.assertEqual(suite_name, task.get_suite_name())
 
-    def test_get_vars_suite_name_gen_resmoke_no_vars(self):
-        task_name = "jsCore"
+    def test_get_suite_name_default_to_task_name(self):
+        task_name = "concurrency_gen"
+        no_gen_task_name = "concurrency"
         task_commands = [{"func": "generate resmoke tasks"}]
         task_dict = {"name": task_name, "commands": task_commands}
         task = _evergreen.Task(task_dict)
 
-        with self.assertRaises(TypeError):
-            task.get_vars_suite_name(None)
+        self.assertEqual(no_gen_task_name, task.get_suite_name())
 
     def test_generate_task_name_non_gen_tasks(self):
         task_name = "jsCore"
@@ -431,111 +391,21 @@ class TestVariant(unittest.TestCase):
 
         # Check combined_resmoke_args when test_flags is set on the variant.
         resmoke_task = variant_ubuntu.get_task("resmoke_task")
-        self.assertEqual("--suites=somesuite --storageEngine=wiredTiger --param=value --ubuntu",
+        self.assertEqual("--suites=resmoke_task --storageEngine=wiredTiger --param=value --ubuntu",
                          resmoke_task.combined_resmoke_args)
 
         # Check combined_resmoke_args when the task doesn't have resmoke_args.
         passing_task = variant_ubuntu.get_task("passing_test")
-        self.assertIsNone(passing_task.combined_resmoke_args)
+        self.assertEqual("--suites=passing_test  --param=value --ubuntu",
+                         passing_task.combined_resmoke_args)
 
         # Check combined_resmoke_args when test_flags is not set on the variant.
         variant_debian = self.conf.get_variant("debian")
         resmoke_task = variant_debian.get_task("resmoke_task")
-        self.assertEqual("--suites=somesuite --storageEngine=wiredTiger",
+        self.assertEqual("--suites=resmoke_task --storageEngine=wiredTiger",
                          resmoke_task.combined_resmoke_args)
 
         # Check for tasks included in task_groups
         variant_amazon = self.conf.get_variant("amazon")
         self.assertEqual(3, len(variant_amazon.tasks))
         self.assertIn("compile", variant_amazon.task_names)
-
-
-class TestResmokeArgs(unittest.TestCase):
-    """Unit tests for the Variant class."""
-
-    def test_get_arg(self):
-        suite_name = "suite1"
-        resmoke_args = "--suites={} test1.js".format(suite_name)
-        self.assertEqual(suite_name, _evergreen.ResmokeArgs.get_arg(resmoke_args, "suites"))
-
-    def test_get_arg_with_space(self):
-        suite_name = "suite1"
-        resmoke_args = "--suites {} test1.js".format(suite_name)
-        self.assertEqual(suite_name, _evergreen.ResmokeArgs.get_arg(resmoke_args, "suites"))
-
-    def test_get_arg_missing(self):
-        suite_name = "suite1"
-        resmoke_args = "--otherArg={} test1.js".format(suite_name)
-        self.assertIsNone(_evergreen.ResmokeArgs.get_arg(resmoke_args, "suites"))
-
-    def test_get_arg_multiple(self):
-        resmoke_args = "--myarg=val1 --myarg=val2 test1.js"
-        with self.assertRaises(RuntimeError):
-            _evergreen.ResmokeArgs.get_arg(resmoke_args, "myarg")
-
-    def test_get_arg_with_comma(self):
-        arg_vals = "val1,val2,val3"
-        resmoke_args = "--myarg={} test1.js".format(arg_vals)
-        self.assertEqual(arg_vals, _evergreen.ResmokeArgs.get_arg(resmoke_args, "myarg"))
-
-    def test_set_arg(self):
-        suite_name = "new_suite"
-        resmoke_args = "--suites=old_suite test1.js"
-        new_resmoke_args = "--suites={} test1.js".format(suite_name)
-        self.assertEqual(new_resmoke_args,
-                         _evergreen.ResmokeArgs.set_updated_arg(resmoke_args, "suites", suite_name))
-
-    def test_set_arg_with_space(self):
-        suite_name = "new_suite"
-        resmoke_args = "--suites old_suite test1.js"
-        new_resmoke_args = "--suites={} test1.js".format(suite_name)
-        self.assertEqual(new_resmoke_args,
-                         _evergreen.ResmokeArgs.set_updated_arg(resmoke_args, "suites", suite_name))
-
-    def test_set_arg_same_suite(self):
-        suite_name = "new_suite"
-        resmoke_args = "--suites=new_suite test1.js"
-        new_resmoke_args = "--suites={} test1.js".format(suite_name)
-        self.assertEqual(new_resmoke_args,
-                         _evergreen.ResmokeArgs.set_updated_arg(resmoke_args, "suites", suite_name))
-
-    def test_set_arg_no_suite(self):
-        suite_name = "new_suite"
-        resmoke_args = "--other_arg=val1 test1.js"
-        new_resmoke_args = "{} --suites={}".format(resmoke_args, suite_name)
-        self.assertEqual(new_resmoke_args,
-                         _evergreen.ResmokeArgs.set_updated_arg(resmoke_args, "suites", suite_name))
-
-    def test_set_arg_multiple(self):
-        new_val = "myval"
-        resmoke_args = "--myarg=val1 --myarg=val2 test1.js"
-        with self.assertRaises(RuntimeError):
-            _evergreen.ResmokeArgs.set_updated_arg(resmoke_args, "myarg", new_val)
-
-    def test_remove_arg(self):
-        resmoke_args = "--suites=old_suite"
-        new_resmoke_args = ""
-        self.assertEqual(new_resmoke_args, _evergreen.ResmokeArgs.remove_arg(
-            resmoke_args, "suites"))
-
-    def test_remove_arg_with_trailing_space(self):
-        resmoke_args = "--suites=old_suite test1.js"
-        new_resmoke_args = "test1.js"
-        self.assertEqual(new_resmoke_args, _evergreen.ResmokeArgs.remove_arg(
-            resmoke_args, "suites"))
-
-    def test_remove_arg_with_space(self):
-        resmoke_args = "--suites old_suite test1.js"
-        new_resmoke_args = "test1.js"
-        self.assertEqual(new_resmoke_args, _evergreen.ResmokeArgs.remove_arg(
-            resmoke_args, "suites"))
-
-    def test_remove_arg_with_comma(self):
-        resmoke_args = "--myarg=val1,val2,val3 test1.js"
-        new_resmoke_args = "test1.js"
-        self.assertEqual(new_resmoke_args, _evergreen.ResmokeArgs.remove_arg(resmoke_args, "myarg"))
-
-    def test_remove_arg_multiple(self):
-        resmoke_args = "--myarg=val1 --myarg=val2 test1.js"
-        with self.assertRaises(RuntimeError):
-            _evergreen.ResmokeArgs.remove_arg(resmoke_args, "myarg")
diff --git a/buildscripts/tests/task_generation/task_types/test_resmoke_tasks.py b/buildscripts/tests/task_generation/task_types/test_resmoke_tasks.py
index a1e68ee2207..b0306ec21d5 100644
--- a/buildscripts/tests/task_generation/task_types/test_resmoke_tasks.py
+++ b/buildscripts/tests/task_generation/task_types/test_resmoke_tasks.py
@@ -55,7 +55,6 @@ def build_mock_suite(n_sub_suites, include_runtimes=True):
         build_variant="build variant",
         task_name="task name",
         suite_name="suite name",
-        filename="suite file",
     )
 
 
diff --git a/buildscripts/tests/task_generation/test_suite_split.py b/buildscripts/tests/task_generation/test_suite_split.py
index cfdb8a9480e..7c54ed489aa 100644
--- a/buildscripts/tests/task_generation/test_suite_split.py
+++ b/buildscripts/tests/task_generation/test_suite_split.py
@@ -92,7 +92,7 @@ class TestGeneratedSuite(unittest.TestCase):
         mock_sub_suites = [build_mock_sub_suite(i, test_lists[i]) for i in range(n_sub_suites)]
         mock_suite = under_test.GeneratedSuite(sub_suites=mock_sub_suites,
                                                build_variant="build_variant", task_name="task_name",
-                                               suite_name="suite_name", filename="filename")
+                                               suite_name="suite_name")
 
         all_tests = mock_suite.get_test_list()
 
@@ -106,7 +106,7 @@ class TestGeneratedSuite(unittest.TestCase):
         mock_sub_suites = [build_mock_sub_suite(i, []) for i in range(n_sub_suites)]
         mock_suite = under_test.GeneratedSuite(sub_suites=mock_sub_suites,
                                                build_variant="build_variant", task_name=task_name,
-                                               suite_name="suite_name", filename="filename")
+                                               suite_name="suite_name")
 
         self.assertEqual(mock_suite.sub_suite_config_file(34), "task_name_34.yml")
         self.assertEqual(mock_suite.sub_suite_config_file(0), "task_name_00.yml")
diff --git a/buildscripts/tests/test_burn_in_tags.py b/buildscripts/tests/test_burn_in_tags.py
index 863fe16d6de..83e3c25d097 100644
--- a/buildscripts/tests/test_burn_in_tags.py
+++ b/buildscripts/tests/test_burn_in_tags.py
@@ -110,10 +110,12 @@ class TestGenerateEvgTasks(unittest.TestCase):
         create_tests_by_task_mock.return_value = {
             "aggregation_mongos_passthrough": TaskInfo(
                 display_task_name="aggregation_mongos_passthrough",
+                suite="aggregation_mongos_passthrough",
                 resmoke_args="--suites=aggregation_mongos_passthrough --storageEngine=wiredTiger",
                 tests=["jstests/aggregation/ifnull.js"],
                 require_multiversion_setup=False,
                 distro="",
+                build_variant="enterprise-rhel-80-64-bit-inmem"
             )
         }  # yapf: disable
         expansions_file_data = get_expansions_data()
diff --git a/buildscripts/tests/test_burn_in_tags_evergreen.yml b/buildscripts/tests/test_burn_in_tags_evergreen.yml
index ac262b2e727..d6a651fcde8 100644
--- a/buildscripts/tests/test_burn_in_tags_evergreen.yml
+++ b/buildscripts/tests/test_burn_in_tags_evergreen.yml
@@ -46,11 +46,11 @@ tasks:
 - name: aggregation_multiversion_fuzzer_gen
   depends_on: []
   commands:
-    - func: "fake command"
+    - func: "generate resmoke tasks"
 - name: aggregation_expression_multiversion_fuzzer_gen
   depends_on: []
   commands:
-    - func: "fake command"
+    - func: "generate resmoke tasks"
 - name: aggregation
   depends_on:
   - name: compile
diff --git a/buildscripts/tests/test_burn_in_tests.py b/buildscripts/tests/test_burn_in_tests.py
index 48f08416630..97e782a3413 100644
--- a/buildscripts/tests/test_burn_in_tests.py
+++ b/buildscripts/tests/test_burn_in_tests.py
@@ -12,7 +12,7 @@ import unittest
 from mock import Mock, patch, MagicMock
 
 import buildscripts.burn_in_tests as under_test
-from buildscripts.ciconfig.evergreen import parse_evergreen_file
+from buildscripts.ciconfig.evergreen import parse_evergreen_file, VariantTask
 import buildscripts.resmokelib.parser as _parser
 _parser.set_run_options()
 
@@ -21,10 +21,10 @@ _parser.set_run_options()
 
 def create_tests_by_task_mock(n_tasks, n_tests):
     return {
-        f"task_{i}_gen":
-        under_test.TaskInfo(display_task_name=f"task_{i}", resmoke_args=f"--suites=suite_{i}",
-                            tests=[f"jstests/tests_{j}" for j in range(n_tests)],
-                            require_multiversion_setup=False, distro=f"distro_{i}")
+        f"task_{i}_gen": under_test.TaskInfo(display_task_name=f"task_{i}", resmoke_args="", tests=[
+            f"jstests/tests_{j}" for j in range(n_tests)
+        ], require_multiversion_setup=False, distro=f"distro_{i}", suite=f"suite_{i}",
+                                             build_variant="dummy_variant")
         for i in range(n_tasks)
     }
 
@@ -165,36 +165,6 @@ class TestGetTaskName(unittest.TestCase):
         self.assertEqual(task_name, under_test._get_task_name(task))
 
 
-class TestSetResmokeArgs(unittest.TestCase):
-    def test__set_resmoke_args(self):
-        resmoke_args = "--suites=suite1 test1.js"
-        task = Mock()
-        task.combined_resmoke_args = resmoke_args
-        task.is_generate_resmoke_task = False
-        self.assertEqual(resmoke_args, under_test._set_resmoke_args(task))
-
-    def test__set_resmoke_args_gen_resmoke_task(self):
-        resmoke_args = "--suites=suite1 test1.js"
-        new_suite = "suite2"
-        new_resmoke_args = "--suites={} test1.js".format(new_suite)
-        task = Mock()
-        task.combined_resmoke_args = resmoke_args
-        task.is_generate_resmoke_task = True
-        task.get_vars_suite_name = lambda cmd_vars: cmd_vars["suite"]
-        task.generate_resmoke_tasks_command = {"vars": {"suite": new_suite}}
-        self.assertEqual(new_resmoke_args, under_test._set_resmoke_args(task))
-
-    def test__set_resmoke_args_gen_resmoke_task_no_suite(self):
-        suite = "suite1"
-        resmoke_args = "--suites={} test1.js".format(suite)
-        task = Mock()
-        task.combined_resmoke_args = resmoke_args
-        task.is_generate_resmoke_task = True
-        task.get_vars_suite_name = lambda cmd_vars: cmd_vars["task"]
-        task.generate_resmoke_tasks_command = {"vars": {"task": suite}}
-        self.assertEqual(resmoke_args, under_test._set_resmoke_args(task))
-
-
 class TestSetResmokeCmd(unittest.TestCase):
     def test__set_resmoke_cmd_no_opts_no_args(self):
         repeat_config = under_test.RepeatConfig()
@@ -318,10 +288,9 @@ def create_variant_task_mock(task_name, suite_name, distro="distro"):
     variant_task = MagicMock()
     variant_task.name = task_name
     variant_task.generated_task_name = task_name
-    variant_task.resmoke_suite = suite_name
-    variant_task.get_vars_suite_name.return_value = suite_name
-    variant_task.combined_resmoke_args = f"--suites={suite_name}"
-    variant_task.require_multiversion_setup = False
+    variant_task.get_suite_name.return_value = suite_name
+    variant_task.resmoke_args = f"--suites={suite_name}"
+    variant_task.require_multiversion_setup.return_value = False
     variant_task.run_on = [distro]
     return variant_task
 
diff --git a/buildscripts/tests/test_evergreen_burn_in_tests.py b/buildscripts/tests/test_evergreen_burn_in_tests.py
index df65874d93d..b9a1acf7880 100644
--- a/buildscripts/tests/test_evergreen_burn_in_tests.py
+++ b/buildscripts/tests/test_evergreen_burn_in_tests.py
@@ -210,8 +210,7 @@ class TestGenerateTimeouts(unittest.TestCase):
         runtime_stats = [teststats_utils.TestRuntime(test_name="dir/test2.js", runtime=455.1)]
         test_name = "dir/test2.js"
 
-        task_generator = under_test.TaskGenerator(MagicMock(), repeat_config, MagicMock(),
-                                                  runtime_stats)
+        task_generator = under_test.BurnInGenTaskService(MagicMock(), repeat_config, runtime_stats)
         timeout_info = task_generator.generate_timeouts(test_name)
 
         self.assertEqual(timeout_info.exec_timeout, 1771)
@@ -222,8 +221,7 @@ class TestGenerateTimeouts(unittest.TestCase):
         runtime_stats = []
         test_name = "dir/new_test.js"
 
-        task_generator = under_test.TaskGenerator(MagicMock(), repeat_config, MagicMock(),
-                                                  runtime_stats)
+        task_generator = under_test.BurnInGenTaskService(MagicMock(), repeat_config, runtime_stats)
         timeout_info = task_generator.generate_timeouts(test_name)
 
         self.assertIsNone(timeout_info.cmd)
@@ -235,8 +233,7 @@ class TestGenerateTimeouts(unittest.TestCase):
         ]
         test_name = "dir/test_with_zero_runtime.js"
 
-        task_generator = under_test.TaskGenerator(MagicMock(), repeat_config, MagicMock(),
-                                                  runtime_stats)
+        task_generator = under_test.BurnInGenTaskService(MagicMock(), repeat_config, runtime_stats)
         timeout_info = task_generator.generate_timeouts(test_name)
 
         self.assertIsNone(timeout_info.cmd)
@@ -300,10 +297,10 @@ TESTS_BY_TASK = {
 
 def create_tests_by_task_mock(n_tasks, n_tests):
     return {
-        f"task_{i}_gen":
-        under_test.TaskInfo(display_task_name=f"task_{i}", resmoke_args=f"--suites=suite_{i}",
-                            tests=[f"jstests/tests_{j}" for j in range(n_tests)],
-                            require_multiversion_setup=False, distro=f"distro_{i}")
+        f"task_{i}_gen": under_test.TaskInfo(display_task_name=f"task_{i}", resmoke_args="", tests=[
+            f"jstests/tests_{j}" for j in range(n_tests)
+        ], require_multiversion_setup=False, distro=f"distro_{i}", build_variant="variant",
+                                             suite=f"suite_{i}")
         for i in range(n_tasks)
     }
 
@@ -317,7 +314,7 @@ class TestCreateGenerateTasksConfig(unittest.TestCase):
         mock_evg_api = MagicMock()
 
         executor = under_test.GenerateBurnInExecutor(gen_config, repeat_config, mock_evg_api)
-        executor.add_config_for_build_variant(build_variant, {})
+        executor.generate_tasks_for_variant({}, build_variant)
 
         evg_config_dict = build_variant.as_dict()
         self.assertEqual(0, len(evg_config_dict["tasks"]))
@@ -335,7 +332,7 @@ class TestCreateGenerateTasksConfig(unittest.TestCase):
         tests_by_task = create_tests_by_task_mock(n_tasks, n_tests)
 
         executor = under_test.GenerateBurnInExecutor(gen_config, repeat_config, mock_evg_api)
-        executor.add_config_for_build_variant(build_variant, tests_by_task)
+        executor.generate_tasks_for_variant(tests_by_task, build_variant)
 
         shrub_config = ShrubProject.empty().add_build_variant(build_variant)
         evg_config_dict = shrub_config.as_dict()
@@ -343,7 +340,7 @@ class TestCreateGenerateTasksConfig(unittest.TestCase):
         self.assertEqual(n_tasks * n_tests, len(tasks))
         cmd = tasks[0]["commands"]
         self.assertIn(resmoke_options, cmd[1]["vars"]["resmoke_args"])
-        self.assertIn("--suites=suite_0", cmd[1]["vars"]["resmoke_args"])
+        self.assertEqual("suite_0", cmd[1]["vars"]["suite"])
         self.assertIn("tests_0", cmd[1]["vars"]["resmoke_args"])
 
     @unittest.skipIf(sys.platform.startswith("win"), "not supported on windows")
@@ -357,7 +354,7 @@ class TestCreateGenerateTasksConfig(unittest.TestCase):
         mock_evg_api = MagicMock()
 
         executor = under_test.GenerateBurnInExecutor(gen_config, repeat_config, mock_evg_api)
-        executor.add_config_for_build_variant(build_variant, tests_by_task)
+        executor.generate_tasks_for_variant(tests_by_task, build_variant)
 
         evg_config_dict = build_variant.as_dict()
         self.assertEqual(n_tasks * n_tests, len(evg_config_dict["tasks"]))
diff --git a/buildscripts/tests/test_selected_tests.py b/buildscripts/tests/test_selected_tests.py
index 76205a64b23..70689345b69 100644
--- a/buildscripts/tests/test_selected_tests.py
+++ b/buildscripts/tests/test_selected_tests.py
@@ -44,8 +44,7 @@ def empty_build_variant(variant_name: str) -> Dict[str, Any]:
     }
 
 
-def configure_dependencies(evg_api, evg_expansions, evg_project_config, selected_test_client,
-                           test_suites_dir=under_test.DEFAULT_TEST_SUITE_DIR):
+def configure_dependencies(evg_api, evg_expansions, evg_project_config, selected_test_client):
     start_date = datetime.utcnow()
     end_date = start_date - timedelta(weeks=2)
 
@@ -236,7 +235,7 @@ class TestGetEvgTaskConfig(unittest.TestCase):
 
         self.assertEqual(evg_task_config["task_name"], "auth")
         self.assertEqual(evg_task_config["build_variant"], "variant")
-        self.assertIsNone(evg_task_config.get("suite"))
+        self.assertEqual(evg_task_config.get("suite"), "auth")
         self.assertEqual(
             evg_task_config["resmoke_args"],
             "--storageEngine=wiredTiger",
@@ -245,15 +244,14 @@ class TestGetEvgTaskConfig(unittest.TestCase):
     def test_task_is_not_a_generate_resmoke_task(self):
         build_variant_conf = MagicMock()
         build_variant_conf.name = "variant"
-        task = build_mock_evg_task("jsCore_auth", "run tests",
-                                   "--suites=core_auth --storageEngine=wiredTiger")
+        task = build_mock_evg_task("jsCore_auth", "run tests", "--storageEngine=wiredTiger")
 
         task_config_service = under_test.TaskConfigService()
         evg_task_config = task_config_service.get_evg_task_config(task, build_variant_conf)
 
         self.assertEqual(evg_task_config["task_name"], "jsCore_auth")
         self.assertEqual(evg_task_config["build_variant"], "variant")
-        self.assertEqual(evg_task_config["suite"], "core_auth")
+        self.assertEqual(evg_task_config["suite"], "jsCore_auth")
         self.assertEqual(
             evg_task_config["resmoke_args"],
             "--storageEngine=wiredTiger",
@@ -281,6 +279,8 @@ class TestGetTaskConfigsForTestMappings(unittest.TestCase):
                     resmoke_args="",
                     require_multiversion_setup=False,
                     distro="",
+                    suite="core_auth",
+                    build_variant="dummy_variant",
                 ),
             "auth_gen":
                 TaskInfo(
@@ -289,6 +289,8 @@ class TestGetTaskConfigsForTestMappings(unittest.TestCase):
                     resmoke_args="",
                     require_multiversion_setup=False,
                     distro="",
+                    suite="auth",
+                    build_variant="dummy_variant",
                 ),
         }
 
@@ -300,7 +302,7 @@ class TestGetTaskConfigsForTestMappings(unittest.TestCase):
         self.assertEqual(
             task_configs["jsCore_auth"]["selected_tests_to_run"],
             {"jstests/core/currentop_waiting_for_latch.js", "jstests/core/latch_analyzer.js"})
-        self.assertEqual(task_configs["auth_gen"]["suite"], "core_auth")
+        self.assertEqual(task_configs["auth_gen"]["suite"], "auth_gen")
         self.assertEqual(task_configs["auth_gen"]["selected_tests_to_run"],
                          {'jstests/auth/auth3.js'})
 
@@ -322,6 +324,8 @@ class TestGetTaskConfigsForTestMappings(unittest.TestCase):
                     resmoke_args="",
                     require_multiversion_setup=False,
                     distro="",
+                    suite="core",
+                    build_variant="dummy_variant",
                 ),
         }
 
@@ -345,6 +349,8 @@ class TestGetTaskConfigsForTestMappings(unittest.TestCase):
                     resmoke_args="",
                     require_multiversion_setup=False,
                     distro="",
+                    suite="core",
+                    build_variant="dummy_variant",
                 ),
         }