Skip to content

evg: remove workaround for missing teardown_task_can_fail_task field #1267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .evergreen/config_generator/components/abi_stability.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

from config_generator.etc.distros import find_large_distro
from config_generator.etc.function import Function, merge_defns
from config_generator.etc.utils import TaskGroup, bash_exec
from config_generator.etc.utils import bash_exec

from shrub.v3.evg_build_variant import BuildVariant, DisplayTask
from shrub.v3.evg_command import EvgCommandType, git_get_project, s3_put
from shrub.v3.evg_task import EvgTask, EvgTaskRef
from shrub.v3.evg_build_variant import BuildVariant, DisplayTask
from shrub.v3.evg_task_group import EvgTaskGroup


TAG = 'abi-stability'
Expand Down Expand Up @@ -149,7 +150,7 @@ def tasks():

def task_groups():
return [
TaskGroup(
EvgTaskGroup(
name=f'tg-{TAG}',
max_hosts=-1,
setup_group_can_fail_task=True,
Expand Down
12 changes: 0 additions & 12 deletions .evergreen/config_generator/etc/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from shrub.v3.evg_project import EvgProject
from shrub.v3.shrub_service import ConfigDumper
from shrub.v3.evg_task import EvgTaskRef
from shrub.v3.evg_task_group import EvgTaskGroup
from typing_extensions import get_args, get_origin, get_type_hints

T = TypeVar('T')
Expand All @@ -28,17 +27,6 @@ class TaskRef(EvgTaskRef):
batchtime: int | None = None


# Equivalent to EvgTaskGroup but defines additional properties.
class TaskGroup(EvgTaskGroup):
"""
An evergreen task group model that also includes additional properties.

(The shrub.py model is missing some properties)
"""

teardown_task_can_fail_task: bool | None = None


# Automatically formats the provided script and invokes it in Bash.
def bash_exec(
script,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dev = [
# .evergreen/config_generator/generate.py
"packaging>=14.0",
"pydantic>=2.7",
"shrub-py>=3.3.1",
"shrub-py>=3.4.0",

# etc/make_release.py
"click>=6.0",
Expand Down
8 changes: 4 additions & 4 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.