From 64a30c4225f2eaac43ea210a2f11d7a274684f72 Mon Sep 17 00:00:00 2001 From: SimonEismann <31125121+SimonEismann@users.noreply.github.com> Date: Fri, 22 Nov 2024 22:28:10 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"SERVER-97469=20Do=20not=20automatical?= =?UTF-8?q?ly=20schedule=20archive=5Fdist=5Ftest=5F=E2=80=A6=20(#29511)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GitOrigin-RevId: a8b50be5cc10fc1ff785f1d0dca80e408a819bf0 --- etc/evergreen_yml_components/definitions.yml | 2 -- .../tasks/compile_tasks_shared.yml | 1 - evergreen/activate_task.py | 8 +------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index 1d028113100..d79497c2d94 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -2883,5 +2883,3 @@ functions: - "src/evergreen/run_python_script.sh" - "evergreen/activate_task.py" - "${task_to_activate}" - - "--skip-for-patch-author" - - "${skip_for_patch_author}" diff --git a/etc/evergreen_yml_components/tasks/compile_tasks_shared.yml b/etc/evergreen_yml_components/tasks/compile_tasks_shared.yml index e45949dab0d..492718d7649 100644 --- a/etc/evergreen_yml_components/tasks/compile_tasks_shared.yml +++ b/etc/evergreen_yml_components/tasks/compile_tasks_shared.yml @@ -146,7 +146,6 @@ tasks: - func: "activate task" vars: task_to_activate: ${archive_dist_test_debug_task_name|archive_dist_test_debug} - skip_for_patch_author: sys-perf-user - func: "scons compile" vars: targets: >- diff --git a/evergreen/activate_task.py b/evergreen/activate_task.py index f8b0f7b04e6..1c8e8b337b3 100644 --- a/evergreen/activate_task.py +++ b/evergreen/activate_task.py @@ -1,22 +1,16 @@ """Script that activates the input task on the same variant as the running task""" -from typing import Optional - import typer 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: Optional[str] = None): +def main(task_name: str): 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: - return - variant_id = expansions.get("build_id") variant = evg_api.build_by_id(variant_id) found_task = None