From 224322ee2a32bdabfad877a5843b1481ffd45989 Mon Sep 17 00:00:00 2001 From: Andrew Bradshaw Date: Thu, 17 Apr 2025 09:16:03 -0700 Subject: [PATCH] SERVER-103958 Add ability to skip activate task (#35138) GitOrigin-RevId: f7396619810137a067e6ae47934ede29b56c4e42 --- etc/evergreen_yml_components/definitions.yml | 1 + .../tasks/compile_tasks_shared.yml | 1 + .../variants/windows/test_dev_master_branch_only.yml | 1 + evergreen/activate_task.py | 8 ++++++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index cc63d004445..6dac63f923e 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -2837,6 +2837,7 @@ functions: - "evergreen/activate_task.py" - "${task_to_activate}" - "${skip_for_patch_author}" + - "${skip_activate_task}" "gen supplementary data": command: subprocess.exec diff --git a/etc/evergreen_yml_components/tasks/compile_tasks_shared.yml b/etc/evergreen_yml_components/tasks/compile_tasks_shared.yml index 1458658455f..c6e887b8c76 100644 --- a/etc/evergreen_yml_components/tasks/compile_tasks_shared.yml +++ b/etc/evergreen_yml_components/tasks/compile_tasks_shared.yml @@ -117,6 +117,7 @@ tasks: vars: task_to_activate: ${archive_dist_test_debug_task_name|archive_dist_test_debug} skip_for_patch_author: sys-perf-user + skip_activate_task: ${skip_archive_dist_test_debug_activate|False} - func: "bazel compile" vars: targets: >- diff --git a/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml index bd0522d9027..e13a6f6ac19 100644 --- a/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml @@ -82,6 +82,7 @@ buildvariants: content_type: application/zip bazel_compile_flags: >- --define=MONGO_DISTMOD=windows + skip_archive_dist_test_debug_activate: True python: "/cygdrive/c/python/python310/python.exe" ext: zip multiversion_platform: windows diff --git a/evergreen/activate_task.py b/evergreen/activate_task.py index a08e9b36780..6be6b4e4988 100755 --- a/evergreen/activate_task.py +++ b/evergreen/activate_task.py @@ -9,13 +9,17 @@ from buildscripts.resmokelib.utils import evergreen_conn from buildscripts.util.read_config import read_config_file -def main(task_name: str, skip_for_patch_author: Annotated[Optional[str], typer.Argument()] = None): +def main( + task_name: str, + skip_for_patch_author: Annotated[Optional[str], typer.Argument()] = None, + skip_activate_task: Annotated[Optional[bool], typer.Argument()] = False, +): expansions_file = "../expansions.yml" expansions = read_config_file(expansions_file) evg_api = evergreen_conn.get_evergreen_api() # Skip activation if the patch author is the excluded user - if expansions.get("author") == skip_for_patch_author: + if expansions.get("author") == skip_for_patch_author or skip_activate_task: return variant_id = expansions.get("build_id")