corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 1415391 - fix beetmover-cdns worker-type schema. r=dustin

Browse Source 
I think I copied this from source_test.py, but didn't need it.  This patch switches to `optionally_keyed_by` and `resolve_keyed_by`. This also fixes a bug where our next mozilla-beta Fennec beta would have used the dev beetmover pool instead of the production pool.

MozReview-Commit-ID: IdLNmFzieMi
This commit is contained in:
Aki Sasaki
2017-11-08 10:12:34 -08:00
parent d776477abf
commit cd7696d1ab
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
taskcluster/taskgraph/transforms/beetmover_cdns.py
View File

@@ -8,7 +8,9 @@ Transform the beetmover-cdns task into a task description.
from __future__ import absolute_import, print_function, unicode_literals
from taskgraph.transforms.base import TransformSequence
from taskgraph.util.schema import validate_schema, Schema
from taskgraph.util.schema import (
optionally_keyed_by, resolve_keyed_by, validate_schema, Schema
)
from taskgraph.util.scriptworker import (
get_beetmover_bucket_scope, get_beetmover_action_scope
)
@@ -35,10 +37,7 @@ beetmover_cdns_description_schema = Schema({
Optional('job-from'): task_description_schema['job-from'],
Optional('run'): {basestring: object},
Optional('run-on-projects'): task_description_schema['run-on-projects'],
Required('worker-type'): Any(
job_description_schema['worker-type'],
{'by-project': {basestring: job_description_schema['worker-type']}},
),
Required('worker-type'): optionally_keyed_by('project', basestring),
Optional('dependencies'): {basestring: taskref_or_string},
Optional('index'): {basestring: basestring},
Optional('routes'): [basestring],
@@ -70,13 +69,18 @@ def make_beetmover_cdns_description(config, jobs):
)
)
resolve_keyed_by(
job, 'worker-type', item_name=job['name'],
project=config.params['project']
)
bucket_scope = get_beetmover_bucket_scope(config)
action_scope = get_beetmover_action_scope(config)
task = {
'label': label,
'description': description,
'worker-type': 'scriptworker-prov-v1/beetmoverworker-dev',
'worker-type': job['worker-type'],
'scopes': [bucket_scope, action_scope],
'product': job['product'],
'dependencies': job['dependencies'],