Bug 1386332 - Clarify nightly l10n signing tasks. r=dustin

MozReview-Commit-ID: LcdSb5kKUAC

--HG--
extra : rebase_source : aa9325ac3c4004cb0781a662cb0e977796ba9f87

taskcluster/ci/nightly-l10n-signing/kind.yml

@@ -5,6 +5,7 @@
 loader: taskgraph.loader.single_dep:loader
 
 transforms:
+   - taskgraph.transforms.name_sanity:transforms
    - taskgraph.transforms.nightly_l10n_signing:transforms
    - taskgraph.transforms.signing:transforms
    - taskgraph.transforms.task:transforms

taskcluster/taskgraph/transforms/name_sanity.py

@@ -21,8 +21,11 @@ def make_label(config, jobs):
     for job in jobs:
         dep_job = job['dependent-task']
         attr = dep_job.attributes.get
+
         if attr('locale', job.get('locale')):
             template = "{kind}-{locale}-{build_platform}/{build_type}"
+        elif attr('l10n_chunk'):
+            template = "{kind}-{build_platform}-{l10n_chunk}/{build_type}"
         else:
             template = "{kind}-{build_platform}/{build_type}"
         job['label'] = template.format(
@@ -30,6 +33,7 @@ def make_label(config, jobs):
             build_platform=attr('build_platform'),
             build_type=attr('build_type'),
             locale=attr('locale', job.get('locale', '')),  # Locale can be absent
+            l10n_chunk=attr('l10n_chunk', '')  # Can be empty
         )
 
         yield job

taskcluster/taskgraph/transforms/nightly_l10n_signing.py

@@ -86,9 +86,6 @@ def make_signing_description(config, jobs):
 
         job['upstream-artifacts'] = upstream_artifacts
 
-        label = dep_job.label.replace("nightly-l10n-", "signing-l10n-")
-        job['label'] = label
-
         # add the chunk number to the TH symbol
         symbol = 'Ns{}'.format(dep_job.attributes.get('l10n_chunk'))
         group = 'tc-L10n'

taskcluster/taskgraph/util/attributes.py

@@ -19,7 +19,7 @@ RELEASE_PROJECTS = {
     'mozilla-release',
 }
 
-_OPTIONAL_ATTRIBUTES = ('nightly', 'signed')
+_OPTIONAL_ATTRIBUTES = ('nightly', 'signed', 'l10n_chunk')
 
 
 def attrmatch(attributes, **kwargs):