taskcluster-taskgraph 14.2.0__tar.gz → 14.2.1__tar.gz

{taskcluster_taskgraph-14.2.0 → taskcluster_taskgraph-14.2.1}/CHANGELOG.md

@@ -1,35 +1,42 @@
 # Change Log
 
-## [14.2.0] - 2025-04-10
+## [14.2.1] - 2025-05-13
 
-## Fixed
+### Fixed
+
+- Revert "generic-worker will now verify run-task/fetch-content integrity" from
+  14.2.0 for being broken
+
+## [14.2.0] - 2025-05-12
+
+### Fixed
 
 - fix actions scope check on mercurial (#686)
 
-## Changed
+### Changed
 
 - generic-worker will now verify run-task/fetch-content integrity (#666)
 
-## Added
+### Added
 
 - new 'load-task' command to debug tasks locally (#680)
 
 ## [14.1.1] - 2025-04-10
 
-## Fixed
+### Fixed
 
 - ensure GraphConfig.root_dir is an absolute path (#673)
 
 ## [14.1.0] - 2025-04-07
 
-## Added
+### Added
 
 - allow task-priority to be keyed by level (#653)
 - implement `taskgraph action` command to generate actions.json on the command line (#645)
 - pass push.base_revision to in-tree-action hook (#656)
 - support for `volume` artifact type (#667)
 
-## Fixed
+### Fixed
 
 - bug deleting long path names with forward slashes on Windows (#661)
 - replace deprecated datetime.utcnow() with timezone-aware alternative (#652)

{taskcluster_taskgraph-14.2.0 → taskcluster_taskgraph-14.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskcluster-taskgraph
-Version: 14.2.0
+Version: 14.2.1
 Summary: Build taskcluster taskgraphs
 Project-URL: Repository, https://github.com/taskcluster/taskgraph
 Project-URL: Issues, https://github.com/taskcluster/taskgraph/issues

{taskcluster_taskgraph-14.2.0 → taskcluster_taskgraph-14.2.1}/src/taskgraph/__init__.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-__version__ = "14.2.0"
+__version__ = "14.2.1"
 
 # Maximum number of dependencies a single task can have
 # https://docs.taskcluster.net/docs/reference/platform/queue/api#createTask

{taskcluster_taskgraph-14.2.0 → taskcluster_taskgraph-14.2.1}/src/taskgraph/transforms/run/run_task.py

@@ -6,9 +6,7 @@ Support for running tasks that are invoked via the `run-task` script.
 """
 
 import dataclasses
-import hashlib
 import os
-from pathlib import Path
 
 from voluptuous import Any, Optional, Required
 
@@ -27,9 +25,6 @@ EXEC_COMMANDS = {
     "powershell": ["powershell.exe", "-ExecutionPolicy", "Bypass"],
 }
 
-RUN_TASK_PATH = Path(__file__).parent.parent.parent / "run-task" / "run-task"
-FETCH_CONTENT_PATH = Path(__file__).parent.parent.parent / "run-task" / "fetch-content"
-
 run_task_schema = Schema(
     {
         Required("using"): "run-task",
@@ -174,14 +169,10 @@ def generic_worker_run_task(config, task, taskdesc):
     common_setup(config, task, taskdesc, command)
 
     worker.setdefault("mounts", [])
-    run_task_sha256 = hashlib.sha256(RUN_TASK_PATH.read_bytes()).hexdigest()
-    fetch_content_sha256 = hashlib.sha256(FETCH_CONTENT_PATH.read_bytes()).hexdigest()
     worker["mounts"].append(
         {
             "content": {
-                "taskId": {"task-reference": "<decision>"},
-                "artifact": "public/run-task",
-                "sha256": run_task_sha256,
+                "url": script_url(config, "run-task"),
             },
             "file": "./run-task",
         }
@@ -190,9 +181,7 @@ def generic_worker_run_task(config, task, taskdesc):
         worker["mounts"].append(
             {
                 "content": {
-                    "taskId": {"task-reference": "<decision>"},
-                    "artifact": "public/fetch-content",
-                    "sha256": fetch_content_sha256,
+                    "url": script_url(config, "fetch-content"),
                 },
                 "file": "./fetch-content",
             }

{taskcluster_taskgraph-14.2.0 → taskcluster_taskgraph-14.2.1}/test/test_transforms_run_run_task.py

@@ -8,7 +8,7 @@ from pprint import pprint
 import pytest
 
 from taskgraph.transforms.run import make_task_description
-from taskgraph.transforms.task import payload_builders
+from taskgraph.transforms.task import payload_builders, set_defaults
 from taskgraph.util.caches import CACHES
 from taskgraph.util.schema import Schema, validate_schema
 from taskgraph.util.templates import merge
@@ -23,6 +23,7 @@ TASK_DEFAULTS = {
         "implementation": "docker-worker",
         "os": "linux",
         "env": {},
+        "max-run-time": 0,
     },
     "run": {"using": "run-task", "command": "echo hello world"},
 }
@@ -70,6 +71,7 @@ def assert_docker_worker(task):
                 "-cx",
                 "echo hello world",
             ],
+            "docker-image": {"in-tree": "image"},
             "env": {
                 "CI_BASE_REPOSITORY": "http://hg.example.com",
                 "CI_HEAD_REF": "default",
@@ -82,6 +84,7 @@ def assert_docker_worker(task):
                 "VCS_PATH": "/builds/worker/checkouts/vcs",
             },
             "implementation": "docker-worker",
+            "max-run-time": 0,
             "os": "linux",
             "taskcluster-proxy": True,
         },
@@ -117,13 +120,12 @@ def assert_generic_worker(task):
                 "VCS_PATH": "build/src",
             },
             "implementation": "generic-worker",
+            "max-run-time": 0,
             "mounts": [
                 {"cache-name": "checkouts", "directory": "build"},
                 {
                     "content": {
-                        "artifact": "public/run-task",
-                        "sha256": "581ca6876fac84fa2dd8e8c2c18677d790890e9675229fd34c912c937ae19fae",
-                        "taskId": {"task-reference": "<decision>"},
+                        "url": "https://tc-tests.localhost/api/queue/v1/task/<TASK_ID>/artifacts/public/run-task"
                     },
                     "file": "./run-task",
                 },
@@ -177,7 +179,7 @@ def assert_run_task_command_generic_worker(task):
     "task",
     (
         pytest.param(
-            {"worker": {"os": "linux"}},
+            {"worker": {"os": "linux", "docker-image": {"in-tree": "image"}}},
             id="docker_worker",
         ),
         pytest.param(
@@ -195,12 +197,14 @@ def assert_run_task_command_generic_worker(task):
                 "run": {
                     "exec-with": "powershell",
                 },
+                "worker": {"docker-image": "powershell"},
             },
             id="exec_with",
         ),
         pytest.param(
             {
                 "run": {"run-task-command": ["/foo/bar/python3", "run-task"]},
+                "worker": {"docker-image": "python"},
             },
             id="run_task_command_docker_worker",
         ),
@@ -223,6 +227,12 @@ def test_run_task(monkeypatch, request, run_task_using, task):
     param_id = request.node.callspec.id
     assert_func = globals()[f"assert_{param_id}"]
     assert_func(taskdesc)
+    taskdesc = next(set_defaults({}, [taskdesc]))
+    validate_schema(
+        payload_builders[taskdesc["worker"]["implementation"]].schema,
+        taskdesc["worker"],
+        "validation error",
+    )
 
 
 @pytest.fixture