Bug 1340564: use an attribute to identify signed tasks; r=Callek
This is a more robust approach than using substring matching on task labels. As an optimization, this simply avoids creating balrog tasks for unsigned beets using only-for-attributes, rather than omitting them in a transform. MozReview-Commit-ID: 8MNOxu0WgXo
This commit is contained in:
@@ -15,3 +15,4 @@ kind-dependencies:
|
|||||||
|
|
||||||
only-for-attributes:
|
only-for-attributes:
|
||||||
- nightly
|
- nightly
|
||||||
|
- signed
|
||||||
|
|||||||
@@ -155,3 +155,7 @@ locale
|
|||||||
For jobs that operate on only one locale, we set the attribute ``locale`` to the
|
For jobs that operate on only one locale, we set the attribute ``locale`` to the
|
||||||
specific locale involved. Currently this is only in l10n versions of the
|
specific locale involved. Currently this is only in l10n versions of the
|
||||||
``beetmover`` and ``balrog`` kinds.
|
``beetmover`` and ``balrog`` kinds.
|
||||||
|
|
||||||
|
signed
|
||||||
|
======
|
||||||
|
Signals that the output of this task contains signed artifacts.
|
||||||
|
|||||||
@@ -49,16 +49,6 @@ def validate(config, jobs):
|
|||||||
"In balrog ({!r} kind) task for {!r}:".format(config.kind, label))
|
"In balrog ({!r} kind) task for {!r}:".format(config.kind, label))
|
||||||
|
|
||||||
|
|
||||||
@transforms.add
|
|
||||||
def skip_unsigned_beets(config, jobs):
|
|
||||||
for job in jobs:
|
|
||||||
if ('signing' not in job['dependent-task'].label and
|
|
||||||
'beetmover-repackage' not in job['dependent-task'].label):
|
|
||||||
# Skip making a balrog task for this
|
|
||||||
continue
|
|
||||||
yield job
|
|
||||||
|
|
||||||
|
|
||||||
@transforms.add
|
@transforms.add
|
||||||
def make_task_description(config, jobs):
|
def make_task_description(config, jobs):
|
||||||
for job in jobs:
|
for job in jobs:
|
||||||
|
|||||||
@@ -222,6 +222,7 @@ def make_task_description(config, jobs):
|
|||||||
|
|
||||||
attributes = {
|
attributes = {
|
||||||
'nightly': dep_job.attributes.get('nightly', False),
|
'nightly': dep_job.attributes.get('nightly', False),
|
||||||
|
'signed': dep_job.attributes.get('signed', False),
|
||||||
'build_platform': dep_job.attributes.get('build_platform'),
|
'build_platform': dep_job.attributes.get('build_platform'),
|
||||||
'build_type': dep_job.attributes.get('build_type'),
|
'build_type': dep_job.attributes.get('build_type'),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ def make_beetmover_checksums_description(config, jobs):
|
|||||||
|
|
||||||
attributes = {
|
attributes = {
|
||||||
'nightly': dep_job.attributes.get('nightly', False),
|
'nightly': dep_job.attributes.get('nightly', False),
|
||||||
|
'signed': dep_job.attributes.get('signed', False),
|
||||||
'build_platform': dep_job.attributes.get('build_platform'),
|
'build_platform': dep_job.attributes.get('build_platform'),
|
||||||
'build_type': dep_job.attributes.get('build_type'),
|
'build_type': dep_job.attributes.get('build_type'),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -147,6 +147,7 @@ def make_task_description(config, jobs):
|
|||||||
|
|
||||||
attributes = {
|
attributes = {
|
||||||
'nightly': dep_job.attributes.get('nightly', False),
|
'nightly': dep_job.attributes.get('nightly', False),
|
||||||
|
'signed': dep_job.attributes.get('signed', False),
|
||||||
'build_platform': dep_job.attributes.get('build_platform'),
|
'build_platform': dep_job.attributes.get('build_platform'),
|
||||||
'build_type': dep_job.attributes.get('build_type'),
|
'build_type': dep_job.attributes.get('build_type'),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,6 +101,7 @@ def make_task_description(config, jobs):
|
|||||||
'nightly': dep_job.attributes.get('nightly', False),
|
'nightly': dep_job.attributes.get('nightly', False),
|
||||||
'build_platform': dep_job.attributes.get('build_platform'),
|
'build_platform': dep_job.attributes.get('build_platform'),
|
||||||
'build_type': dep_job.attributes.get('build_type'),
|
'build_type': dep_job.attributes.get('build_type'),
|
||||||
|
'signed': True,
|
||||||
}
|
}
|
||||||
if dep_job.attributes.get('chunk_locales'):
|
if dep_job.attributes.get('chunk_locales'):
|
||||||
# Used for l10n attribute passthrough
|
# Used for l10n attribute passthrough
|
||||||
|
|||||||
Reference in New Issue
Block a user