Bug 1423801: Include trust-domain in the scopes to use for sccache; r?dustin draft
authorTom Prince <mozilla@hocat.ca>
Thu, 21 Dec 2017 14:43:38 -0700
changeset 714162 7628cf129aaabcb98c6e100e85ace5e89306531f
parent 714159 69d120dd95667611df87b983d24a9b40fbf68642
child 744549 4ae596084233881f143c2968fbf9ca5f89c4dc93
push id93877
push userbmo:mozilla@hocat.ca
push dateThu, 21 Dec 2017 22:05:38 +0000
reviewersdustin
bugs1423801
milestone59.0a1
Bug 1423801: Include trust-domain in the scopes to use for sccache; r?dustin MozReview-Commit-ID: KepwpXJFo8X
taskcluster/taskgraph/transforms/task.py
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -785,17 +785,18 @@ def build_docker_worker_payload(config, 
         features['chainOfTrust'] = True
 
     if worker.get('docker-in-docker'):
         features['dind'] = True
 
     if task.get('needs-sccache'):
         features['taskclusterProxy'] = True
         task_def['scopes'].append(
-            'assume:project:taskcluster:level-{level}-sccache-buckets'.format(
+            'assume:project:taskcluster:{trust_domain}:level-{level}-sccache-buckets'.format(
+                trust_domain=config.graph_config['trust-domain'],
                 level=config.params['level'])
         )
         worker['env']['USE_SCCACHE'] = '1'
     else:
         worker['env']['SCCACHE_DISABLE'] = '1'
 
     capabilities = {}