Bug 1385094 - Don't include docker image in chain of trust for builds if not using an in-tree image; r?dustin draft
authorTom Prince <mozilla@hocat.ca>
Wed, 16 Aug 2017 13:14:39 -0600
changeset 647687 c37d19aba341617034d00ffd69ba9dcf72816e79
parent 617060 24354c2b003cb243c9a3f137354c7e7b00c1379e
child 726600 11ff65f5f225f1c50e413bdc443794f512ace1b4
push id74506
push userbmo:mozilla@hocat.ca
push dateWed, 16 Aug 2017 19:15:33 +0000
reviewersdustin
bugs1385094
milestone56.0a1
Bug 1385094 - Don't include docker image in chain of trust for builds if not using an in-tree image; r?dustin MozReview-Commit-ID: J6RkxSUqZrx
taskcluster/taskgraph/transforms/build.py
--- a/taskcluster/taskgraph/transforms/build.py
+++ b/taskcluster/taskgraph/transforms/build.py
@@ -24,19 +24,20 @@ def set_defaults(config, jobs):
         _, worker_os = worker_type_implementation(job['worker-type'])
         worker = job.setdefault('worker', {})
         if worker_os == "linux":
             worker.setdefault('docker-image', {'in-tree': 'desktop-build'})
             worker['chain-of-trust'] = True
             extra = job.setdefault('extra', {})
             extra.setdefault('chainOfTrust', {})
             extra['chainOfTrust'].setdefault('inputs', {})
-            extra['chainOfTrust']['inputs']['docker-image'] = {
-                "task-reference": "<docker-image>"
-            }
+            if 'in-tree' in worker['docker-image']:
+                extra['chainOfTrust']['inputs']['docker-image'] = {
+                    "task-reference": "<docker-image>"
+                }
         elif worker_os == "windows":
             worker.setdefault('env', {})
             worker['chain-of-trust'] = True
         elif worker_os == "macosx":
             worker.setdefault('env', {})
 
         yield job