Skip to content

Commit 1e754dc

Browse files
eramongodberamongodb
authored
evg: remove config_generator.etc.utils.Task (#1765)
* poetry: bump shrub.py to 3.3.0 * Remove config_generator.etc.utils.Task * Defer most formatting behavior to shrub.v3.shrub_service.ConfigDumper * Use caret requirement for shrub-py
1 parent 3590768 commit 1e754dc

File tree

14 files changed

+149
-236
lines changed

14 files changed

+149
-236
lines changed

‎.evergreen/config_generator/components/c_std_compile.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from shrub.v3.evg_build_variant import BuildVariant
22
from shrub.v3.evg_command import EvgCommandType
3-
from shrub.v3.evg_task import EvgTaskRef
3+
from shrub.v3.evg_task import EvgTask, EvgTaskRef
44

55
from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
66

@@ -9,7 +9,6 @@
99
from config_generator.etc.distros import to_cc
1010
from config_generator.etc.function import Function
1111
from config_generator.etc.utils import bash_exec
12-
from config_generator.etc.utils import Task
1312

1413

1514
TAG = 'std-matrix'
@@ -78,7 +77,7 @@ def tasks():
7877
task_name = f'std-c{std}-{distro_str}-compile'
7978

8079
res.append(
81-
Task(
80+
EvgTask(
8281
name=task_name,
8382
run_on=distro.name,
8483
tags=tags + [f'std-c{std}'],

‎.evergreen/config_generator/components/earthly.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
from shrub.v3.evg_build_variant import BuildVariant
88
from shrub.v3.evg_command import BuiltInCommand, EvgCommandType, subprocess_exec
9-
from shrub.v3.evg_task import EvgTaskRef
9+
from shrub.v3.evg_task import EvgTask, EvgTaskRef
1010

11-
from ..etc.utils import Task, all_possible
11+
from ..etc.utils import all_possible
1212

1313
T = TypeVar("T")
1414

@@ -191,7 +191,7 @@ def earthly_task(
191191
name: str,
192192
targets: Iterable[str],
193193
config: Configuration,
194-
) -> Task | None:
194+
) -> EvgTask | None:
195195
"""
196196
Create an EVG task which executes earthly using the given parameters. If this
197197
function returns `None`, then the task configuration is excluded from executing
@@ -212,7 +212,7 @@ def earthly_task(
212212
"env": f"${{{_ENV_PARAM_NAME}}}",
213213
"c_compiler": f"${{{_CC_PARAM_NAME}}}",
214214
}
215-
return Task(
215+
return EvgTask(
216216
name=name,
217217
commands=[
218218
# First, just build the "env-warmup" which will prepare the build environment.
@@ -249,7 +249,7 @@ def earthly_task(
249249
]
250250

251251

252-
def tasks() -> Iterable[Task]:
252+
def tasks() -> Iterable[EvgTask]:
253253
for conf in all_possible(Configuration):
254254
task = earthly_task(
255255
name=f"check:{conf.suffix}",

‎.evergreen/config_generator/components/loadbalanced.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from shrub.v3.evg_build_variant import BuildVariant
22
from shrub.v3.evg_command import EvgCommandType, FunctionCall, expansions_update
3-
from shrub.v3.evg_task import EvgTaskRef, EvgTaskDependency
3+
from shrub.v3.evg_task import EvgTask, EvgTaskRef, EvgTaskDependency
44

55
from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration
66
from config_generator.components.funcs.fetch_build import FetchBuild
@@ -10,7 +10,7 @@
1010
from config_generator.components.funcs.run_tests import RunTests
1111
from config_generator.components.funcs.upload_build import UploadBuild
1212
from config_generator.etc.distros import make_distro_str, find_small_distro, find_large_distro
13-
from config_generator.etc.utils import Task, bash_exec
13+
from config_generator.etc.utils import bash_exec
1414

1515
# Use `rhel8.7` distro. `rhel8.7` distro includes necessary dependency: `haproxy`.
1616
_DISTRO_NAME = "rhel87"
@@ -40,7 +40,7 @@ def make_test_task(auth: bool, ssl: bool, server_version: str):
4040
auth_str = "auth" if auth else "noauth"
4141
ssl_str = "openssl" if ssl else "nossl"
4242
distro_str = make_distro_str(_DISTRO_NAME, _COMPILER, None)
43-
return Task(
43+
return EvgTask(
4444
name=f"loadbalanced-{distro_str}-test-{server_version}-{auth_str}-{ssl_str}",
4545
depends_on=[EvgTaskDependency(
4646
name=f"loadbalanced-{distro_str}-compile")],
@@ -72,7 +72,7 @@ def make_test_task(auth: bool, ssl: bool, server_version: str):
7272

7373
def tasks():
7474
distro_str = make_distro_str(_DISTRO_NAME, _COMPILER, None)
75-
yield Task(
75+
yield EvgTask(
7676
name=f"loadbalanced-{distro_str}-compile",
7777
run_on=find_large_distro(_DISTRO_NAME).name,
7878
tags=['loadbalanced', _DISTRO_NAME, _COMPILER],

‎.evergreen/config_generator/components/misc.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
from typing import Iterable
22

33
from shrub.v3.evg_build_variant import BuildVariant
4-
from shrub.v3.evg_task import EvgTaskRef
4+
from shrub.v3.evg_task import EvgTask, EvgTaskRef
55

6-
from ..etc.utils import Task
76
from . import earthly
87

98

10-
def tasks() -> Iterable[Task]:
11-
yield Task(
9+
def tasks() -> Iterable[EvgTask]:
10+
yield EvgTask(
1211
name="create-silk-asset-group",
1312
commands=[
1413
earthly.earthly_exec(

‎.evergreen/config_generator/components/mock_server.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
from shrub.v3.evg_build_variant import BuildVariant
22
from shrub.v3.evg_command import EvgCommandType
3-
from shrub.v3.evg_task import EvgTaskRef
3+
from shrub.v3.evg_task import EvgTask, EvgTaskRef
44

55
from config_generator.components.funcs.fetch_det import FetchDET
66
from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
77
from config_generator.components.funcs.run_simple_http_server import RunSimpleHTTPServer
8-
from config_generator.etc.utils import Task
98
from config_generator.etc.utils import bash_exec
109

1110
def tasks():
1211
return [
13-
Task(
12+
EvgTask(
1413
name="mock-server-test",
1514
run_on="ubuntu2204-small",
1615
commands=[

‎.evergreen/config_generator/components/openssl_static_compile.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from shrub.v3.evg_build_variant import BuildVariant
22
from shrub.v3.evg_command import EvgCommandType
3-
from shrub.v3.evg_task import EvgTaskRef
3+
from shrub.v3.evg_task import EvgTask, EvgTaskRef
44

55
from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
66

@@ -9,7 +9,6 @@
99
from config_generator.etc.distros import to_cc
1010
from config_generator.etc.function import Function
1111
from config_generator.etc.utils import bash_exec
12-
from config_generator.etc.utils import Task
1312

1413
SSL = 'openssl-static'
1514
TAG = f'{SSL}-matrix'
@@ -67,7 +66,7 @@ def tasks():
6766
task_name = f'openssl-static-compile-{distro_str}'
6867

6968
res.append(
70-
Task(
69+
EvgTask(
7170
name=task_name,
7271
run_on=distro.name,
7372
tags=tags,

‎.evergreen/config_generator/components/scan_build.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from shrub.v3.evg_build_variant import BuildVariant
22
from shrub.v3.evg_command import EvgCommandType
33
from shrub.v3.evg_command import FunctionCall
4-
from shrub.v3.evg_task import EvgTaskRef
4+
from shrub.v3.evg_task import EvgTask, EvgTaskRef
55

66
from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
77

@@ -10,7 +10,6 @@
1010
from config_generator.etc.distros import to_cc
1111
from config_generator.etc.function import Function
1212
from config_generator.etc.utils import bash_exec
13-
from config_generator.etc.utils import Task
1413

1514

1615
TAG = 'scan-build-matrix'
@@ -71,7 +70,7 @@ def tasks():
7170
task_name = f'scan-build-{distro_str}'
7271

7372
res.append(
74-
Task(
73+
EvgTask(
7574
name=task_name,
7675
run_on=distro.name,
7776
tags=tags,

‎.evergreen/config_generator/etc/compile.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
from shrub.v3.evg_task import EvgTask
2+
13
from config_generator.etc.distros import find_large_distro
24
from config_generator.etc.distros import make_distro_str
35
from config_generator.etc.distros import to_cc
4-
from config_generator.etc.utils import Task
56

67
from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
78
from config_generator.components.funcs.upload_build import UploadBuild
@@ -41,7 +42,7 @@ def generate_compile_tasks(SSL, TAG, SASL_TO_FUNC, MATRIX, MORE_TAGS=None, MORE_
4142
commands.append(UploadBuild.call())
4243

4344
res.append(
44-
Task(
45+
EvgTask(
4546
name=task_name,
4647
run_on=distro.name,
4748
tags=tags + [f'sasl-{sasl}'],

‎.evergreen/config_generator/etc/cse/test.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
from shrub.v3.evg_command import expansions_update
44
from shrub.v3.evg_command import KeyValueParam
5-
from shrub.v3.evg_task import EvgTaskDependency
5+
from shrub.v3.evg_task import EvgTask, EvgTaskDependency
66

77
from config_generator.etc.distros import find_small_distro
88
from config_generator.etc.distros import make_distro_str
99
from config_generator.etc.distros import to_cc
10-
from config_generator.etc.utils import Task
1110

1211
from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration
1312
from config_generator.components.funcs.fetch_build import FetchBuild
@@ -64,7 +63,7 @@ def generate_test_tasks(SSL, TAG, MATRIX):
6463
test_commands.append(RunTests.call())
6564

6665
res.append(
67-
Task(
66+
EvgTask(
6867
name=test_task_name,
6968
run_on=test_distro.name,
7069
tags=test_tags,

‎.evergreen/config_generator/etc/sanitizers/test.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
from shrub.v3.evg_command import expansions_update
44
from shrub.v3.evg_command import KeyValueParam
5-
from shrub.v3.evg_task import EvgTaskDependency
5+
from shrub.v3.evg_task import EvgTask, EvgTaskDependency
66

77
from config_generator.etc.distros import find_small_distro
88
from config_generator.etc.distros import make_distro_str
99
from config_generator.etc.distros import to_cc
10-
from config_generator.etc.utils import Task
1110

1211
from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration
1312
from config_generator.components.funcs.fetch_build import FetchBuild
@@ -93,7 +92,7 @@ def generate_test_tasks(SSL, TAG, MATRIX, MORE_COMPILE_TAGS=None, MORE_TEST_TAGS
9392
test_commands.append(RunTests.call())
9493

9594
res.append(
96-
Task(
95+
EvgTask(
9796
name=test_task_name,
9897
run_on=test_distro.name,
9998
tags=test_tags,

‎.evergreen/config_generator/etc/sasl/test.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
from shrub.v3.evg_command import expansions_update
44
from shrub.v3.evg_command import KeyValueParam
5-
from shrub.v3.evg_task import EvgTaskDependency
5+
from shrub.v3.evg_task import EvgTask, EvgTaskDependency
66

77
from config_generator.etc.distros import find_small_distro
88
from config_generator.etc.distros import make_distro_str
99
from config_generator.etc.distros import to_cc
10-
from config_generator.etc.utils import Task
1110

1211
from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration
1312
from config_generator.components.funcs.fetch_build import FetchBuild
@@ -65,7 +64,7 @@ def generate_test_tasks(SSL, TAG, MATRIX):
6564
test_commands.append(RunTests.call())
6665

6766
res.append(
68-
Task(
67+
EvgTask(
6968
name=test_task_name,
7069
run_on=test_distro.name,
7170
tags=test_tags,

0 commit comments

Comments
 (0)