Bug 1386332 - Clarify repackage tasks. r=dustin

MozReview-Commit-ID: LwWRhqZ7cZb

--HG--
extra : rebase_source : 6cb0d61a85c1b3a41d3c2701bea4ee51fa562aa5
This commit is contained in:
Justin Wood 2017-08-01 12:29:37 -04:00
Родитель b880a4b11e
Коммит 32d21744f2
4 изменённых файлов: 12 добавлений и 7 удалений

Просмотреть файл

@ -6,6 +6,7 @@ loader: taskgraph.loader.single_dep:loader
transforms: transforms:
- taskgraph.transforms.repackage_l10n:transforms - taskgraph.transforms.repackage_l10n:transforms
- taskgraph.transforms.name_sanity:transforms
- taskgraph.transforms.repackage:transforms - taskgraph.transforms.repackage:transforms
- taskgraph.transforms.job:transforms - taskgraph.transforms.job:transforms
- taskgraph.transforms.task:transforms - taskgraph.transforms.task:transforms

Просмотреть файл

@ -5,6 +5,7 @@
loader: taskgraph.loader.single_dep:loader loader: taskgraph.loader.single_dep:loader
transforms: transforms:
- taskgraph.transforms.name_sanity:transforms
- taskgraph.transforms.repackage:transforms - taskgraph.transforms.repackage:transforms
- taskgraph.transforms.repackage_routes:transforms - taskgraph.transforms.repackage_routes:transforms
- taskgraph.transforms.job:transforms - taskgraph.transforms.job:transforms

Просмотреть файл

@ -157,10 +157,18 @@ def make_job_description(config, jobs):
cot = job.setdefault('extra', {}).setdefault('chainOfTrust', {}) cot = job.setdefault('extra', {}).setdefault('chainOfTrust', {})
cot.setdefault('inputs', {})['docker-image'] = {"task-reference": "<docker-image>"} cot.setdefault('inputs', {})['docker-image'] = {"task-reference": "<docker-image>"}
description = (
"Repackaging for locale '{locale}' for build '"
"{build_platform}/{build_type}'".format(
locale=attributes.get('locale', 'en-US'),
build_platform=attributes.get('build_platform'),
build_type=attributes.get('build_type')
)
)
task = { task = {
'label': job['label'], 'label': job['label'],
'description': "{} Repackage".format( 'description': description,
dep_job.task["metadata"]["description"]),
'worker-type': worker_type, 'worker-type': worker_type,
'dependencies': dependencies, 'dependencies': dependencies,
'attributes': attributes, 'attributes': attributes,

Просмотреть файл

@ -17,17 +17,12 @@ def split_locales(config, jobs):
for job in jobs: for job in jobs:
dep_job = job['dependent-task'] dep_job = job['dependent-task']
for locale in dep_job.attributes.get('chunk_locales', []): for locale in dep_job.attributes.get('chunk_locales', []):
label = dep_job.label.replace("signing-", "repackage-{}-".format(locale))
label = "repackage-{}-{}/{}".format(locale,
dep_job.attributes['build_platform'],
dep_job.attributes['build_type'],)
treeherder = job.get('treeherder', {}) treeherder = job.get('treeherder', {})
treeherder['symbol'] = 'tc-L10n-Rpk({})'.format(locale) treeherder['symbol'] = 'tc-L10n-Rpk({})'.format(locale)
yield { yield {
'locale': locale, 'locale': locale,
'label': label,
'treeherder': treeherder, 'treeherder': treeherder,
'dependent-task': dep_job, 'dependent-task': dep_job,
} }