SERVER-54297 Split up the archiving of the server and its debug info

7 files changed, 15 insertions, 11 deletions

diff --git a/buildscripts/burn_in_tests.py b/buildscripts/burn_in_tests.py
index a5880ca595c..6fda727d70a 100755
--- a/buildscripts/burn_in_tests.py
+++ b/buildscripts/burn_in_tests.py
@@ -575,7 +575,7 @@ def _create_task(index: int, test_count: int, test: str, task_data: Dict,
         run_tests_vars["task_path_suffix"] = multiversion_path
     timeout = _generate_timeouts(repeat_config, test, task_runtime_stats)
     commands = resmoke_commands("run tests", run_tests_vars, timeout, multiversion_path)
-    dependencies = {TaskDependency("archive_dist_test")}
+    dependencies = {TaskDependency("archive_dist_test_debug")}
 
     return Task(sub_task_name, commands, dependencies)
 
diff --git a/buildscripts/bypass_compile_and_fetch_binaries.py b/buildscripts/bypass_compile_and_fetch_binaries.py
index b8f018ca808..cce1258bf66 100755
--- a/buildscripts/bypass_compile_and_fetch_binaries.py
+++ b/buildscripts/bypass_compile_and_fetch_binaries.py
@@ -312,7 +312,7 @@ def find_previous_compile_task(build: Build) -> Task:
     :param build: Build containing the desired compile task.
     :return: Evergreen.py object containing data about the desired compile task.
     """
-    tasks = [task for task in build.get_tasks() if task.display_name == "archive_dist_test"]
+    tasks = [task for task in build.get_tasks() if task.display_name == "archive_dist_test_debug"]
     assert len(tasks) == 1
     return tasks[0]
 
diff --git a/buildscripts/evergreen_gen_fuzzer_tests.py b/buildscripts/evergreen_gen_fuzzer_tests.py
index fa36fbea080..bcb24ba4ee7 100755
--- a/buildscripts/evergreen_gen_fuzzer_tests.py
+++ b/buildscripts/evergreen_gen_fuzzer_tests.py
@@ -113,7 +113,7 @@ def build_fuzzer_sub_task(task_name: str, task_index: int, options: ConfigOption
     ]
     commands = [command for command in commands if command is not None]
 
-    return Task(sub_task_name, commands, {TaskDependency("archive_dist_test")})
+    return Task(sub_task_name, commands, {TaskDependency("archive_dist_test_debug")})
 
 
 def generate_fuzzer_sub_tasks(task_name: str, options: ConfigOptions) -> Set[Task]:
diff --git a/buildscripts/evergreen_gen_multiversion_tests.py b/buildscripts/evergreen_gen_multiversion_tests.py
index 94f91a6fbe2..f639aa55787 100755
--- a/buildscripts/evergreen_gen_multiversion_tests.py
+++ b/buildscripts/evergreen_gen_multiversion_tests.py
@@ -183,7 +183,7 @@ class EvergreenMultiversionConfigGenerator(object):
             FunctionCall("run generated tests", run_tests_vars),
         ]
 
-        return Task(sub_task_name, commands, {TaskDependency("archive_dist_test")})
+        return Task(sub_task_name, commands, {TaskDependency("archive_dist_test_debug")})
 
     def _generate_burn_in_execution_tasks(self, version_configs: List[str], suites: List[Suite],
                                           burn_in_test: str, burn_in_idx: int,
diff --git a/buildscripts/evergreen_generate_resmoke_tasks.py b/buildscripts/evergreen_generate_resmoke_tasks.py
index eabfa99196e..03de5fa3001 100755
--- a/buildscripts/evergreen_generate_resmoke_tasks.py
+++ b/buildscripts/evergreen_generate_resmoke_tasks.py
@@ -754,7 +754,7 @@ class EvergreenConfigGenerator(object):
 
     def _get_dependencies(self) -> Set[TaskDependency]:
         """Get the set of dependency tasks for these suites."""
-        dependencies = {TaskDependency("archive_dist_test")}
+        dependencies = {TaskDependency("archive_dist_test_debug")}
         if not self.options.is_patch:
             # Don"t worry about task dependencies in patch builds, only mainline.
             if self.options.depends_on:
diff --git a/buildscripts/resmokelib/setup_multiversion/evergreen_conn.py b/buildscripts/resmokelib/setup_multiversion/evergreen_conn.py
index 3194e279455..6c318a0a18b 100644
--- a/buildscripts/resmokelib/setup_multiversion/evergreen_conn.py
+++ b/buildscripts/resmokelib/setup_multiversion/evergreen_conn.py
@@ -118,9 +118,13 @@ def get_compile_artifact_urls(evg_api, evg_version, buildvariant_name):
         push_task = None
 
         for evg_task in evg_tasks:
-            if evg_task.display_name in ("compile", "archive_dist_test"):
+            # Only set the compile task if there isn't one already, otherwise
+            # newer tasks like "archive_dist_test_debug" take precedence.
+            if evg_task.display_name in ("compile", "archive_dist_test") and compile_task is None:
                 compile_task = evg_task
-            if evg_task.display_name == "push":
+            elif evg_task.display_name == "archive_dist_test_debug":
+                compile_task = evg_task
+            elif evg_task.display_name == "push":
                 push_task = evg_task
             if compile_task and push_task:
                 break
diff --git a/buildscripts/tests/test_bypass_compile_and_fetch_binaries.py b/buildscripts/tests/test_bypass_compile_and_fetch_binaries.py
index d568169a50b..1b1c0f1573d 100644
--- a/buildscripts/tests/test_bypass_compile_and_fetch_binaries.py
+++ b/buildscripts/tests/test_bypass_compile_and_fetch_binaries.py
@@ -167,7 +167,7 @@ class TestFetchArtifactsForPreviousCompileTask(unittest.TestCase):
         artifact_mock.url = "http://s3.amazon.com/mciuploads/mongodb/build_var//binaries/mongo-test.tgz"
         artifacts_mock = [artifact_mock]
 
-        task_response = MagicMock(status="success", display_name="archive_dist_test")
+        task_response = MagicMock(status="success", display_name="archive_dist_test_debug")
         task_response.artifacts = artifacts_mock
         build.get_tasks.return_value = [task_response]
 
@@ -186,7 +186,7 @@ class TestFetchArtifactsForPreviousCompileTask(unittest.TestCase):
 
         artifacts_mock = []
 
-        task_response = MagicMock(status="success", display_name="archive_dist_test")
+        task_response = MagicMock(status="success", display_name="archive_dist_test_debug")
         task_response.artifacts = artifacts_mock
         build.get_tasks.return_value = [task_response]
 
@@ -198,7 +198,7 @@ class TestFetchArtifactsForPreviousCompileTask(unittest.TestCase):
         build_id = "project_variant_patch_a22_date"
         build = MagicMock(id=build_id)
 
-        task_response = MagicMock(status="failure", display_name="archive_dist_test")
+        task_response = MagicMock(status="failure", display_name="archive_dist_test_debug")
         task_response.is_success.return_value = False
         build.get_tasks.return_value = [task_response]
 
@@ -208,7 +208,7 @@ class TestFetchArtifactsForPreviousCompileTask(unittest.TestCase):
 
 class TestFindPreviousCompileTask(unittest.TestCase):
     def test_find_task(self):
-        task_response = MagicMock(status="success", display_name="archive_dist_test")
+        task_response = MagicMock(status="success", display_name="archive_dist_test_debug")
         build = MagicMock()
         build.get_tasks.return_value = [task_response]