Bug 1453273,1453255,1453253 - add esr60 fixes in automation. r=aki
☠☠ backed out by 2db2fd52dd66 ☠ ☠
authorMihai Tabara <mtabara@mozilla.com>
Fri, 20 Apr 2018 09:54:03 +0100
changeset 415557 1527cfbcd067b594afc71fc2a7673f5bffed1a94
parent 415556 51c27d9d25eaca9db40ef561bd3f9cdab63bf9b0
child 415558 91c634efec59c22682f16126e83e738713caae5f
push id102606
push usermtabara@mozilla.com
push dateWed, 25 Apr 2018 18:14:19 +0000
treeherdermozilla-inbound@1527cfbcd067 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki
bugs1453273, 1453255, 1453253
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1453273,1453255,1453253 - add esr60 fixes in automation. r=aki
taskcluster/ci/beetmover-cdns/kind.yml
taskcluster/ci/release-beetmover-signed-langpacks/kind.yml
taskcluster/ci/release-generate-checksums-beetmover/kind.yml
taskcluster/ci/release-sign-and-push-langpacks/kind.yml
taskcluster/taskgraph/transforms/balrog_submit.py
taskcluster/taskgraph/transforms/partials_signing.py
--- a/taskcluster/ci/beetmover-cdns/kind.yml
+++ b/taskcluster/ci/beetmover-cdns/kind.yml
@@ -9,16 +9,22 @@ transforms:
    - taskgraph.transforms.beetmover_cdns:transforms
    - taskgraph.transforms.release_notifications:transforms
    - taskgraph.transforms.task:transforms
 
 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
 
 jobs:
    fennec-push-to-cdns:
       name: fennec_push_to_cdns
       product: fennec
       shipping-product: fennec
--- a/taskcluster/ci/release-beetmover-signed-langpacks/kind.yml
+++ b/taskcluster/ci/release-beetmover-signed-langpacks/kind.yml
@@ -17,12 +17,13 @@ only-for-attributes:
    - nightly
 
 job-template:
    description: Beetmover submission for platform-independent langpacks {locales} in {platform} directory
    worker-type:
       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
    shipping-product: firefox
--- a/taskcluster/ci/release-generate-checksums-beetmover/kind.yml
+++ b/taskcluster/ci/release-generate-checksums-beetmover/kind.yml
@@ -14,9 +14,10 @@ kind-dependencies:
 
 job-template:
    shipping-phase: promote
    worker-type:
       by-project:
          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
--- a/taskcluster/ci/release-sign-and-push-langpacks/kind.yml
+++ b/taskcluster/ci/release-sign-and-push-langpacks/kind.yml
@@ -21,28 +21,31 @@ only-for-build-platforms:
 
 
 job-template:
    description: Signs {locales} XPIs for platform via addons.mozilla.org and pushes them
    worker-type:
       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
       channel:
          by-project:
             # Only release langpacks are listed publicly
             mozilla-release: listed
             default: unlisted
       upstream-artifacts:   # See transforms
    run-on-projects: []
    scopes:
       by-project:
          mozilla-beta:
             - 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
    shipping-product: firefox
--- a/taskcluster/taskgraph/transforms/balrog_submit.py
+++ b/taskcluster/taskgraph/transforms/balrog_submit.py
@@ -5,16 +5,19 @@
 Transform the beetmover task into an actual task description.
 """
 
 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
 
 
 # Voluptuous uses marker objects as dictionary *keys*, but they are not
 # comparable, so we cast all of the keys back to regular strings
 task_description_schema = {str(k): v for k, v in task_description_schema.schema.iteritems()}
 
@@ -90,19 +93,22 @@ def make_task_description(config, jobs):
         upstream_artifacts = [{
             "taskId": {"task-reference": "<beetmover>"},
             "taskType": "beetmover",
             "paths": [
                 "public/manifest.json"
             ],
         }]
 
+        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,
                 'balrog-action': 'submit-locale',
             },
             'dependencies': {'beetmover': dep_job.label},
             'attributes': attributes,
             'run-on-projects': dep_job.attributes.get('run_on_projects'),
--- a/taskcluster/taskgraph/transforms/partials_signing.py
+++ b/taskcluster/taskgraph/transforms/partials_signing.py
@@ -3,17 +3,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 """
 Transform the partials task into an actual task description.
 """
 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
 
 import logging
 logger = logging.getLogger(__name__)
 
 transforms = TransformSequence()
 
@@ -78,20 +81,20 @@ def make_task_description(config, jobs):
         signing_cert_scope = get_signing_cert_scope_per_platform(
             build_platform, is_nightly, config
         )
         scopes = [signing_cert_scope, 'project:releng:signing:format:mar_sha384']
         task = {
             '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,
             'run-on-projects': dep_job.attributes.get('run_on_projects'),
             'treeherder': treeherder,
         }
 
         yield task