Commit 0c036f0b authored by Aki Sasaki's avatar Aki Sasaki
Browse files

Bug 1677914 - enable chain of trust on mac builders. r=taskgraph-reviewers,jmaher,glandium

Differential Revision: https://phabricator.services.mozilla.com/D97470
parent e90bb206
......@@ -34,11 +34,9 @@ def set_defaults(config, jobs):
)
worker = job.setdefault("worker", {})
worker.setdefault("env", {})
worker["chain-of-trust"] = True
if worker_os == "linux":
worker.setdefault("docker-image", {"in-tree": "debian8-amd64-build"})
worker["chain-of-trust"] = True
elif worker_os == "windows":
worker["chain-of-trust"] = True
yield job
......
......@@ -175,6 +175,7 @@ def generic_worker_toolchain(config, job, taskdesc):
run = job["run"]
worker = taskdesc["worker"] = job["worker"]
worker["chain-of-trust"] = True
# Allow the job to specify where artifacts come from, but add
# public/build if it's not there already.
......@@ -183,9 +184,6 @@ def generic_worker_toolchain(config, job, taskdesc):
generic_worker_add_artifacts(config, job, taskdesc)
if job["worker"]["os"] == "windows":
# mac workers don't support chain-of-trust yet.
worker["chain-of-trust"] = True
# There were no caches on generic-worker before bug 1519472, and they cause
# all sorts of problems with Windows toolchain tasks, disable them until
# tasks are ready.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment