Bug 1313678: rename task description chainOfTrust to chain-of-trust; r=aki
authorDustin J. Mitchell <dustin@mozilla.com>
Fri, 28 Oct 2016 14:36:09 +0000
changeset 320018 c73966e96185df03a866f1750867cbd45f1d6b77
parent 320017 8476b951e74f9e0f4f6e324d2ff8d7ceb79d17f0
child 320019 e5ea056e363e1de37370ab850dcd037de632b0b1
push id20749
push userryanvm@gmail.com
push dateSat, 29 Oct 2016 13:21:21 +0000
treeherderfx-team@1b170b39ed6b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki
bugs1313678
milestone52.0a1
Bug 1313678: rename task description chainOfTrust to chain-of-trust; r=aki Note that this does not affect task.extra.chainOfTrust, and thus has no impact on the generated task JSON. MozReview-Commit-ID: ERSVZlQUMpK
taskcluster/taskgraph/transforms/build.py
taskcluster/taskgraph/transforms/task.py
--- a/taskcluster/taskgraph/transforms/build.py
+++ b/taskcluster/taskgraph/transforms/build.py
@@ -16,16 +16,16 @@ transforms = TransformSequence()
 @transforms.add
 def set_defaults(config, jobs):
     """Set defaults, including those that differ per worker implementation"""
     for job in jobs:
         job['treeherder'].setdefault('kind', 'build')
         job['treeherder'].setdefault('tier', 1)
         if job['worker']['implementation'] in ('docker-worker', 'docker-engine'):
             job['worker'].setdefault('docker-image', {'in-tree': 'desktop-build'})
-            job['worker']['chainOfTrust'] = True
+            job['worker']['chain-of-trust'] = True
             job.setdefault('extra', {})
             job['extra'].setdefault('chainOfTrust', {})
             job['extra']['chainOfTrust'].setdefault('inputs', {})
             job['extra']['chainOfTrust']['inputs']['docker-image'] = {
                 "task-reference": "<docker-image>"
             }
         yield job
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -152,17 +152,17 @@ task_description_schema = Schema({
             # a raw Docker image path (repo/image:tag)
             basestring,
             # an in-tree generated docker image (from `testing/docker/<name>`)
             {'in-tree': basestring}
         ),
 
         # worker features that should be enabled
         Required('relengapi-proxy', default=False): bool,
-        Required('chainOfTrust', default=False): bool,
+        Required('chain-of-trust', default=False): bool,
         Required('taskcluster-proxy', default=False): bool,
         Required('allow-ptrace', default=False): bool,
         Required('loopback-video', default=False): bool,
         Required('loopback-audio', default=False): bool,
 
         # caches to set up for the task
         Optional('caches'): [{
             # only one type is supported by any of the workers right now
@@ -337,17 +337,17 @@ def build_docker_worker_payload(config, 
 
     if worker.get('taskcluster-proxy'):
         features['taskclusterProxy'] = True
 
     if worker.get('allow-ptrace'):
         features['allowPtrace'] = True
         task_def['scopes'].append('docker-worker:feature:allowPtrace')
 
-    if worker.get('chainOfTrust'):
+    if worker.get('chain-of-trust'):
         features['chainOfTrust'] = True
 
     capabilities = {}
 
     for lo in 'audio', 'video':
         if worker.get('loopback-' + lo):
             capitalized = 'loopback' + lo.capitalize()
             devices = capabilities.setdefault('devices', {})