evg: remove config_generator.etc.utils.Task

.evergreen/config_generator/components/c_std_compile.py

@@ -1,6 +1,6 @@
 from shrub.v3.evg_build_variant import BuildVariant
 from shrub.v3.evg_command import EvgCommandType
-from shrub.v3.evg_task import EvgTaskRef
+from shrub.v3.evg_task import EvgTask, EvgTaskRef
 
 from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
 
@@ -9,7 +9,6 @@
 from config_generator.etc.distros import to_cc
 from config_generator.etc.function import Function
 from config_generator.etc.utils import bash_exec
-from config_generator.etc.utils import Task
 
 
 TAG = 'std-matrix'
@@ -78,7 +77,7 @@ def tasks():
             task_name = f'std-c{std}-{distro_str}-compile'
 
             res.append(
-                Task(
+                EvgTask(
                     name=task_name,
                     run_on=distro.name,
                     tags=tags + [f'std-c{std}'],

.evergreen/config_generator/components/earthly.py

@@ -6,9 +6,9 @@
 
 from shrub.v3.evg_build_variant import BuildVariant
 from shrub.v3.evg_command import BuiltInCommand, EvgCommandType, subprocess_exec
-from shrub.v3.evg_task import EvgTaskRef
+from shrub.v3.evg_task import EvgTask, EvgTaskRef
 
-from ..etc.utils import Task, all_possible
+from ..etc.utils import all_possible
 
 T = TypeVar("T")
 
@@ -191,7 +191,7 @@ def earthly_task(
     name: str,
     targets: Iterable[str],
     config: Configuration,
-) -> Task | None:
+) -> EvgTask | None:
     """
     Create an EVG task which executes earthly using the given parameters. If this
     function returns `None`, then the task configuration is excluded from executing
@@ -212,7 +212,7 @@ def earthly_task(
         "env": f"${{{_ENV_PARAM_NAME}}}",
         "c_compiler": f"${{{_CC_PARAM_NAME}}}",
     }
-    return Task(
+    return EvgTask(
         name=name,
         commands=[
             # First, just build the "env-warmup" which will prepare the build environment.
@@ -249,7 +249,7 @@ def earthly_task(
 ]
 
 
-def tasks() -> Iterable[Task]:
+def tasks() -> Iterable[EvgTask]:
     for conf in all_possible(Configuration):
         task = earthly_task(
             name=f"check:{conf.suffix}",

.evergreen/config_generator/components/loadbalanced.py

@@ -1,6 +1,6 @@
 from shrub.v3.evg_build_variant import BuildVariant
 from shrub.v3.evg_command import EvgCommandType, FunctionCall, expansions_update
-from shrub.v3.evg_task import EvgTaskRef, EvgTaskDependency
+from shrub.v3.evg_task import EvgTask, EvgTaskRef, EvgTaskDependency
 
 from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration
 from config_generator.components.funcs.fetch_build import FetchBuild
@@ -10,7 +10,7 @@
 from config_generator.components.funcs.run_tests import RunTests
 from config_generator.components.funcs.upload_build import UploadBuild
 from config_generator.etc.distros import make_distro_str, find_small_distro, find_large_distro
-from config_generator.etc.utils import Task, bash_exec
+from config_generator.etc.utils import bash_exec
 
 # Use `rhel8.7` distro. `rhel8.7` distro includes necessary dependency: `haproxy`.
 _DISTRO_NAME = "rhel87"
@@ -40,7 +40,7 @@ def make_test_task(auth: bool, ssl: bool, server_version: str):
     auth_str = "auth" if auth else "noauth"
     ssl_str = "openssl" if ssl else "nossl"
     distro_str = make_distro_str(_DISTRO_NAME, _COMPILER, None)
-    return Task(
+    return EvgTask(
         name=f"loadbalanced-{distro_str}-test-{server_version}-{auth_str}-{ssl_str}",
         depends_on=[EvgTaskDependency(
             name=f"loadbalanced-{distro_str}-compile")],
@@ -72,7 +72,7 @@ def make_test_task(auth: bool, ssl: bool, server_version: str):
 
 def tasks():
     distro_str = make_distro_str(_DISTRO_NAME, _COMPILER, None)
-    yield Task(
+    yield EvgTask(
         name=f"loadbalanced-{distro_str}-compile",
         run_on=find_large_distro(_DISTRO_NAME).name,
         tags=['loadbalanced', _DISTRO_NAME, _COMPILER],

.evergreen/config_generator/components/misc.py

@@ -1,14 +1,13 @@
 from typing import Iterable
 
 from shrub.v3.evg_build_variant import BuildVariant
-from shrub.v3.evg_task import EvgTaskRef
+from shrub.v3.evg_task import EvgTask, EvgTaskRef
 
-from ..etc.utils import Task
 from . import earthly
 
 
-def tasks() -> Iterable[Task]:
-    yield Task(
+def tasks() -> Iterable[EvgTask]:
+    yield EvgTask(
         name="create-silk-asset-group",
         commands=[
             earthly.earthly_exec(

.evergreen/config_generator/components/mock_server.py

@@ -1,16 +1,15 @@
 from shrub.v3.evg_build_variant import BuildVariant
 from shrub.v3.evg_command import EvgCommandType
-from shrub.v3.evg_task import EvgTaskRef
+from shrub.v3.evg_task import EvgTask, EvgTaskRef
 
 from config_generator.components.funcs.fetch_det import FetchDET
 from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
 from config_generator.components.funcs.run_simple_http_server import RunSimpleHTTPServer
-from config_generator.etc.utils import Task
 from config_generator.etc.utils import bash_exec
 
 def tasks():
     return [
-        Task(
+        EvgTask(
             name="mock-server-test",
             run_on="ubuntu2204-small",
             commands=[

.evergreen/config_generator/components/openssl_static_compile.py

@@ -1,6 +1,6 @@
 from shrub.v3.evg_build_variant import BuildVariant
 from shrub.v3.evg_command import EvgCommandType
-from shrub.v3.evg_task import EvgTaskRef
+from shrub.v3.evg_task import EvgTask, EvgTaskRef
 
 from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
 
@@ -9,7 +9,6 @@
 from config_generator.etc.distros import to_cc
 from config_generator.etc.function import Function
 from config_generator.etc.utils import bash_exec
-from config_generator.etc.utils import Task
 
 SSL = 'openssl-static'
 TAG = f'{SSL}-matrix'
@@ -67,7 +66,7 @@ def tasks():
         task_name = f'openssl-static-compile-{distro_str}'
 
         res.append(
-            Task(
+            EvgTask(
                 name=task_name,
                 run_on=distro.name,
                 tags=tags,

.evergreen/config_generator/components/scan_build.py

@@ -1,7 +1,7 @@
 from shrub.v3.evg_build_variant import BuildVariant
 from shrub.v3.evg_command import EvgCommandType
 from shrub.v3.evg_command import FunctionCall
-from shrub.v3.evg_task import EvgTaskRef
+from shrub.v3.evg_task import EvgTask, EvgTaskRef
 
 from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
 
@@ -10,7 +10,6 @@
 from config_generator.etc.distros import to_cc
 from config_generator.etc.function import Function
 from config_generator.etc.utils import bash_exec
-from config_generator.etc.utils import Task
 
 
 TAG = 'scan-build-matrix'
@@ -71,7 +70,7 @@ def tasks():
         task_name = f'scan-build-{distro_str}'
 
         res.append(
-            Task(
+            EvgTask(
                 name=task_name,
                 run_on=distro.name,
                 tags=tags,

.evergreen/config_generator/etc/compile.py

@@ -1,7 +1,8 @@
+from shrub.v3.evg_task import EvgTask
+
 from config_generator.etc.distros import find_large_distro
 from config_generator.etc.distros import make_distro_str
 from config_generator.etc.distros import to_cc
-from config_generator.etc.utils import Task
 
 from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
 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_
             commands.append(UploadBuild.call())
 
             res.append(
-                Task(
+                EvgTask(
                     name=task_name,
                     run_on=distro.name,
                     tags=tags + [f'sasl-{sasl}'],

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

@@ -2,12 +2,11 @@
 
 from shrub.v3.evg_command import expansions_update
 from shrub.v3.evg_command import KeyValueParam
-from shrub.v3.evg_task import EvgTaskDependency
+from shrub.v3.evg_task import EvgTask, EvgTaskDependency
 
 from config_generator.etc.distros import find_small_distro
 from config_generator.etc.distros import make_distro_str
 from config_generator.etc.distros import to_cc
-from config_generator.etc.utils import Task
 
 from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration
 from config_generator.components.funcs.fetch_build import FetchBuild
@@ -64,7 +63,7 @@ def generate_test_tasks(SSL, TAG, MATRIX):
             test_commands.append(RunTests.call())
 
             res.append(
-                Task(
+                EvgTask(
                     name=test_task_name,
                     run_on=test_distro.name,
                     tags=test_tags,

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

@@ -2,12 +2,11 @@
 
 from shrub.v3.evg_command import expansions_update
 from shrub.v3.evg_command import KeyValueParam
-from shrub.v3.evg_task import EvgTaskDependency
+from shrub.v3.evg_task import EvgTask, EvgTaskDependency
 
 from config_generator.etc.distros import find_small_distro
 from config_generator.etc.distros import make_distro_str
 from config_generator.etc.distros import to_cc
-from config_generator.etc.utils import Task
 
 from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration
 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
             test_commands.append(RunTests.call())
 
             res.append(
-                Task(
+                EvgTask(
                     name=test_task_name,
                     run_on=test_distro.name,
                     tags=test_tags,

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

@@ -2,12 +2,11 @@
 
 from shrub.v3.evg_command import expansions_update
 from shrub.v3.evg_command import KeyValueParam
-from shrub.v3.evg_task import EvgTaskDependency
+from shrub.v3.evg_task import EvgTask, EvgTaskDependency
 
 from config_generator.etc.distros import find_small_distro
 from config_generator.etc.distros import make_distro_str
 from config_generator.etc.distros import to_cc
-from config_generator.etc.utils import Task
 
 from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration
 from config_generator.components.funcs.fetch_build import FetchBuild
@@ -65,7 +64,7 @@ def generate_test_tasks(SSL, TAG, MATRIX):
             test_commands.append(RunTests.call())
 
             res.append(
-                Task(
+                EvgTask(
                     name=test_task_name,
                     run_on=test_distro.name,
                     tags=test_tags,