commit f1135d926ea4d8979664d02f42ab38953cc258c4
parent 6b7f65af48130d51d0863797c9b5213a9632a1b1
Author: Andrew Halberstadt <ahal@mozilla.com>
Date: Tue, 4 Nov 2025 14:46:07 +0000
Bug 1997979 - Upload both Gecko and upstream run-task scripts as Decision artifacts, r=taskgraph-reviewers,jcristau
Differential Revision: https://phabricator.services.mozilla.com/D271125
Diffstat:
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/taskcluster/gecko_taskgraph/decision.py b/taskcluster/gecko_taskgraph/decision.py
@@ -243,9 +243,10 @@ def taskgraph_decision(options, parameters=None):
GECKO, "third_party", "python", "taskcluster_taskgraph", "taskgraph"
)
to_copy = {
- scripts_dir / "run-task": ARTIFACTS_DIR,
+ scripts_dir / "run-task": f"{ARTIFACTS_DIR}/run-task-hg",
scripts_dir / "tester" / "test-linux.sh": ARTIFACTS_DIR,
taskgraph_dir / "run-task" / "fetch-content": ARTIFACTS_DIR,
+ taskgraph_dir / "run-task" / "run-task": f"{ARTIFACTS_DIR}/run-task-git",
mozharness_dir / "external_tools" / "robustcheckout.py": ARTIFACTS_DIR,
}
for target, dest in to_copy.items():
diff --git a/taskcluster/gecko_taskgraph/transforms/job/run_task.py b/taskcluster/gecko_taskgraph/transforms/job/run_task.py
@@ -181,10 +181,13 @@ def generic_worker_run_task(config, job, taskdesc):
common_setup(config, job, taskdesc, command)
worker.setdefault("mounts", [])
+ run_task_bin = (
+ "run-task-git" if config.params["repository_type"] == "git" else "run-task-hg"
+ )
worker["mounts"].append(
{
"content": {
- "url": script_url(config, "run-task"),
+ "url": script_url(config, run_task_bin),
},
"file": "./run-task",
}