Bug 1562412 - shippable-l10n-signing multi_dep. r=Callek

Differential Revision: https://phabricator.services.mozilla.com/D57741

--HG--
extra : moz-landing-system : lando

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

@@ -2,17 +2,25 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
-loader: taskgraph.loader.single_dep:loader
+loader: taskgraph.loader.multi_dep:loader
+
+group-by: chunk-locales
 
 transforms:
     - taskgraph.transforms.name_sanity:transforms
+    - taskgraph.transforms.upstream_artifact_task:transforms
     - taskgraph.transforms.shippable_l10n_signing:transforms
     - taskgraph.transforms.signing:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - shippable-l10n
+    - shippable-l10n-notarization-part-1
+    - shippable-l10n-notarization-poller
+
+primary-dependency:
+    - shippable-l10n
 
 only-for-attributes:
-    - nightly
     - shippable
+    - nightly

taskcluster/taskgraph/transforms/shippable_l10n_signing.py

@@ -49,20 +49,24 @@ def define_upstream_artifacts(config, jobs):
             config,
             job,
             keep_locale_template=True,
+            dep_kind=upstream_artifact_task.kind,
         )
 
         upstream_artifacts = []
         for spec in locale_specifications:
+            task_type = 'l10n'
+            if 'notarization' in upstream_artifact_task.kind:
+                task_type = 'scriptworker'
             upstream_artifacts.append({
                 'taskId': {'task-reference': '<{}>'.format(upstream_artifact_task.kind)},
-                'taskType': 'l10n',
+                'taskType': task_type,
                 # Set paths based on artifacts in the specs (above) one per
                 # locale present in the chunk this is signing stuff for.
                 # Pass paths through set and sorted() so we get a list back
                 # and we remove any duplicates (e.g. hardcoded ja-JP-mac langpack)
                 'paths': sorted(set([
                     path_template.format(locale=locale)
-                    for locale in dep_job.attributes.get('chunk_locales', [])
+                    for locale in upstream_artifact_task.attributes.get('chunk_locales', [])
                     for path_template in spec['artifacts']
                 ])),
                 'formats': spec['formats']