Merge m-c to inbound, a=merge
authorWes Kocher <wkocher@mozilla.com>
Thu, 01 Dec 2016 15:56:14 -0800
changeset 325086 77937052e69946270dbb040918f421ca879c4104
parent 325085 ca40b6ff416d2aa61a7a89dad46432daab3f1856 (current diff)
parent 325035 6f39c69810f258b4108f8ee88048c5b690a503a2 (diff)
child 325087 05fe18ec6d95b4068f01bd1c636fbf024162a5d8
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersmerge
milestone53.0a1
Merge m-c to inbound, a=merge
--- a/taskcluster/taskgraph/transforms/android_stuff.py
+++ b/taskcluster/taskgraph/transforms/android_stuff.py
@@ -3,16 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 """
 Set dynamic task description properties of the android stuff.  Temporary!
 """
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
+from taskgraph.transforms.job.common import SECRET_SCOPE
 
 transforms = TransformSequence()
 
 
 @transforms.add
 def setup_task(config, tasks):
     for task in tasks:
         task['label'] = task['name']
@@ -37,10 +38,15 @@ def setup_task(config, tasks):
         if int(config.params['level']) > 1:
             task['worker'].setdefault('caches', []).append({
                 'type': 'persistent',
                 'name': 'level-{}-{}-build-{}-workspace'.format(
                     config.params['level'], config.params['project'], task['name']),
                 'mount-point': "/home/worker/workspace",
             })
 
+        # Need appropriate scopes for secrets, from the 'build' section
+        task['worker']['taskcluster-proxy'] = True
+        task['scopes'].append(SECRET_SCOPE.format(
+            'build', config.params['level'], '*'))
+
         del task['name']
         yield task