Bug 1453273,1453255,1453253 - add esr60 fixes in automation. r=aki

--HG--
extra : rebase_source : 991312e6cfbbb616e2c5f5706e9b3c1b8e6e0263
extra : source : cf2e01720435b19d7fb1320c48a91728b39bddaa

taskcluster/ci/beetmover-cdns/kind.yml

@@ -14,6 +14,12 @@ kind-dependencies:
    - release-generate-checksums-beetmover
 
 job-defaults:
+   worker-type:
+      by-project:
+         mozilla-release: scriptworker-prov-v1/beetmoverworker-v1
+         mozilla-beta: scriptworker-prov-v1/beetmoverworker-v1
+         mozilla-esr60: scriptworker-prov-v1/beetmoverworker-v1
+         default: scriptworker-prov-v1/beetmoverworker-dev
    run-on-projects: []
    shipping-phase: push
 

taskcluster/ci/release-beetmover-signed-langpacks/kind.yml

@@ -22,6 +22,7 @@ job-template:
       by-project:
          mozilla-beta: scriptworker-prov-v1/beetmoverworker-v1
          mozilla-release: scriptworker-prov-v1/beetmoverworker-v1
+         mozilla-esr60: scriptworker-prov-v1/beetmoverworker-v1
          default: scriptworker-prov-v1/beetmoverworker-dev
    run-on-projects: []
    shipping-phase: promote

taskcluster/ci/release-generate-checksums-beetmover/kind.yml

@@ -19,4 +19,5 @@ job-template:
          mozilla-central: scriptworker-prov-v1/beetmoverworker-v1
          mozilla-beta: scriptworker-prov-v1/beetmoverworker-v1
          mozilla-release: scriptworker-prov-v1/beetmoverworker-v1
+         mozilla-esr60: scriptworker-prov-v1/beetmoverworker-v1
          default: scriptworker-prov-v1/beetmoverworker-dev

taskcluster/ci/release-sign-and-push-langpacks/kind.yml

@@ -26,6 +26,7 @@ job-template:
       by-project:
          mozilla-beta: scriptworker-prov-v1/addon-v1
          mozilla-release: scriptworker-prov-v1/addon-v1
+         mozilla-esr60: scriptworker-prov-v1/addon-v1
          default: scriptworker-prov-v1/addon-dev
    worker:
       implementation: sign-and-push-addons
@@ -42,6 +43,8 @@ job-template:
             - project:releng:addons.mozilla.org:server:production
          mozilla-release:
             - project:releng:addons.mozilla.org:server:production
+         mozilla-esr60:
+            - project:releng:addons.mozilla.org:server:production
          default:
             - project:releng:addons.mozilla.org:server:staging
    shipping-phase: promote

taskcluster/taskgraph/transforms/balrog_submit.py

@@ -10,6 +10,9 @@ from __future__ import absolute_import, print_function, unicode_literals
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema
+from taskgraph.util.scriptworker import (
+    get_balrog_server_scope, get_worker_type_for_scope
+)
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Any, Required, Optional
 
@@ -95,9 +98,12 @@ def make_task_description(config, jobs):
             ],
         }]
 
+        server_scope = get_balrog_server_scope(config)
+
         task = {
             'label': label,
             'description': description,
+            'worker-type': get_worker_type_for_scope(config, server_scope),
             'worker': {
                 'implementation': 'balrog',
                 'upstream-artifacts': upstream_artifacts,

taskcluster/taskgraph/transforms/partials_signing.py

@@ -8,7 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.attributes import copy_attributes_from_dependent_job
-from taskgraph.util.scriptworker import get_signing_cert_scope_per_platform
+from taskgraph.util.scriptworker import (
+    get_signing_cert_scope_per_platform,
+    get_worker_type_for_scope,
+)
 from taskgraph.util.partials import get_balrog_platform_name, get_partials_artifacts
 from taskgraph.util.taskcluster import get_artifact_prefix
 
@@ -83,10 +86,10 @@ def make_task_description(config, jobs):
             'label': label,
             'description': "{} Partials".format(
                 dep_job.task["metadata"]["description"]),
-            'worker-type': 'scriptworker-prov-v1/signing-linux-v1',
+            'worker-type': get_worker_type_for_scope(config, signing_cert_scope),
             'worker': {'implementation': 'scriptworker-signing',
-                           'upstream-artifacts': upstream_artifacts,
-                           'max-run-time': 3600},
+                       'upstream-artifacts': upstream_artifacts,
+                       'max-run-time': 3600},
             'dependencies': dependencies,
             'attributes': attributes,
             'scopes': scopes,