Merge pull request #691 from jcristau/revert-gw-run-task-mount

Revert "Let generic-worker verify run-task/fetch-content integrity"

Author: jcristau

CHANGELOG.md

@@ -4,8 +4,8 @@
 
 ### Fixed
 
-- regression in 14.2.0 causing schema validation failure for generic-worker
-  tasks using run-task (#688)
+- Revert "generic-worker will now verify run-task/fetch-content integrity" from
+  14.2.0 for being broken
 
 ## [14.2.0] - 2025-05-12
 

src/taskgraph/transforms/run/run_task.py

@@ -6,9 +6,7 @@
 """
 
 import dataclasses
-import hashlib
 import os
-from pathlib import Path
 
 from voluptuous import Any, Optional, Required
 
@@ -27,9 +25,6 @@
     "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": {
-                "task-id": {"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": {
-                    "task-id": {"task-reference": "<decision>"},
-                    "artifact": "public/fetch-content",
-                    "sha256": fetch_content_sha256,
+                    "url": script_url(config, "fetch-content"),
                 },
                 "file": "./fetch-content",
             }

src/taskgraph/transforms/task.py

@@ -622,8 +622,6 @@ def build_docker_worker_payload(config, task, task_def):
                     # URL that supplies the content in response to an unauthenticated
                     # GET request.
                     Optional("url"): str,
-                    # SHA256 checksum of the content body
-                    Optional("sha256"): str,
                 },
                 # *** Either file or directory must be specified. ***
                 # If mounting a cache or read-only directory, the filesystem location of

test/test_transforms_run_run_task.py

@@ -8,7 +8,7 @@
 import pytest
 
 from taskgraph.transforms.run import make_task_description
-from taskgraph.transforms.task import payload_builders, set_defaults
+from taskgraph.transforms.task import payload_builders
 from taskgraph.util.caches import CACHES
 from taskgraph.util.schema import Schema, validate_schema
 from taskgraph.util.templates import merge
@@ -70,7 +70,6 @@ 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",
@@ -88,13 +87,6 @@ def assert_docker_worker(task):
         },
         "worker-type": "t-linux",
     }
-    taskdesc = next(set_defaults({}, [task]))
-    taskdesc["worker"]["max-run-time"] = 0
-    validate_schema(
-        payload_builders[taskdesc["worker"]["implementation"]].schema,
-        taskdesc["worker"],
-        "validation error",
-    )
 
 
 def assert_generic_worker(task):
@@ -129,9 +121,7 @@ def assert_generic_worker(task):
                 {"cache-name": "checkouts", "directory": "build"},
                 {
                     "content": {
-                        "artifact": "public/run-task",
-                        "sha256": "581ca6876fac84fa2dd8e8c2c18677d790890e9675229fd34c912c937ae19fae",
-                        "task-id": {"task-reference": "<decision>"},
+                        "url": "https://tc-tests.localhost/api/queue/v1/task/<TASK_ID>/artifacts/public/run-task"
                     },
                     "file": "./run-task",
                 },
@@ -140,13 +130,6 @@ def assert_generic_worker(task):
         },
         "worker-type": "b-win2012",
     }
-    taskdesc = next(set_defaults({}, [task]))
-    taskdesc["worker"]["max-run-time"] = 0
-    validate_schema(
-        payload_builders[taskdesc["worker"]["implementation"]].schema,
-        taskdesc["worker"],
-        "validation error",
-    )
 
 
 def assert_exec_with(task):
@@ -192,7 +175,7 @@ def assert_run_task_command_generic_worker(task):
     "task",
     (
         pytest.param(
-            {"worker": {"os": "linux", "docker-image": {"in-tree": "image"}}},
+            {"worker": {"os": "linux"}},
             id="docker_worker",
         ),
         pytest.param(