Backed out 2 changesets (bug 1605275, bug 1605277) for build sign bustage on a CLOSED TREE.

Backed out changeset af16e71c6922 (bug 1605277)
Backed out changeset 4534f3e46f6e (bug 1605275)

taskcluster/ci/config.yml

@@ -255,6 +255,11 @@ scriptworker:
     # See additional configuration in taskcluster/taskgraph/util/scriptworker.py
     scope-prefix: 'project:releng'
     worker-types:
+        'linux-signing':
+            - 'project:releng:signing:cert:release-signing'
+            - 'project:releng:signing:cert:nightly-signing'
+        'linux-depsigning':
+            - 'project:releng:signing:cert:dep-signing'
         'scriptworker-k8s/gecko-3-beetmover':
             - 'project:releng:beetmover:bucket:release'
             - 'project:releng:beetmover:bucket:nightly'
@@ -336,10 +341,7 @@ workers:
             provisioner: scriptworker-k8s
             implementation: scriptworker-signing
             os: linux
-            worker-type:
-                by-release-level:
-                    production: gecko-3-signing
-                    staging: gecko-t-signing
+            worker-type: gecko-3-signing
         mac-depsigning:
             provisioner: scriptworker-prov-v1
             implementation: scriptworker-iscript

taskcluster/taskgraph/config.py

@@ -82,7 +82,7 @@ graph_config_schema = Schema({
                 Required('provisioner'): optionally_keyed_by('level', text_type),
                 Required('implementation'): text_type,
                 Required('os'): text_type,
-                Required('worker-type'): optionally_keyed_by('level', 'release-level', text_type),
+                Required('worker-type'): optionally_keyed_by('level', text_type),
             }
         },
     },

taskcluster/taskgraph/transforms/geckodriver_signing.py

@@ -12,6 +12,7 @@ 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,
+    get_worker_type_for_scope,
 )
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Required, Optional
@@ -68,7 +69,7 @@ def make_repackage_signing_description(config, jobs):
         task = {
             'label': job['label'],
             'description': description,
-            'worker-type': 'linux-signing',
+            'worker-type': get_worker_type_for_scope(config, signing_cert_scope),
             'worker': {
                 'implementation': 'scriptworker-signing',
                 'upstream-artifacts': upstream_artifacts,

taskcluster/taskgraph/transforms/mar_signing.py

@@ -12,6 +12,7 @@ from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.attributes import copy_attributes_from_dependent_job, sorted_unique_list
 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_params
 from taskgraph.util.taskcluster import get_artifact_prefix
@@ -147,7 +148,7 @@ def make_task_description(config, jobs):
             'label': label,
             'description': "{} {}".format(
                 dep_job.task["metadata"]["description"], job['description-suffix']),
-            'worker-type': 'linux-signing',
+            'worker-type': get_worker_type_for_scope(config, signing_cert_scope),
             'worker': {'implementation': 'scriptworker-signing',
                        'upstream-artifacts': upstream_artifacts,
                        'max-run-time': 3600},

taskcluster/taskgraph/transforms/openh264_signing.py

@@ -12,6 +12,7 @@ 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,
+    get_worker_type_for_scope,
 )
 from taskgraph.util.treeherder import inherit_treeherder_from_dep
 from taskgraph.transforms.task import task_description_schema
@@ -81,7 +82,7 @@ def make_signing_description(config, jobs):
         task = {
             'label': job['label'],
             'description': description,
-            'worker-type': 'linux-signing',
+            'worker-type': get_worker_type_for_scope(config, signing_cert_scope),
             'worker': {'implementation': 'scriptworker-signing',
                        'upstream-artifacts': upstream_artifacts,
                        'max-run-time': 3600},

taskcluster/taskgraph/transforms/release_generate_checksums_signing.py

@@ -12,6 +12,7 @@ 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,
+    get_worker_type_for_scope,
 )
 from taskgraph.util.taskcluster import get_artifact_path
 from taskgraph.transforms.task import task_description_schema
@@ -67,7 +68,7 @@ def make_release_generate_checksums_signing_description(config, jobs):
         task = {
             'label': label,
             'description': description,
-            'worker-type': 'linux-signing',
+            'worker-type': get_worker_type_for_scope(config, signing_cert_scope),
             'worker': {'implementation': 'scriptworker-signing',
                        'upstream-artifacts': upstream_artifacts,
                        'max-run-time': 3600},

taskcluster/taskgraph/transforms/repackage_signing.py

@@ -14,6 +14,7 @@ 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,
+    get_worker_type_for_scope,
 )
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Required, Optional
@@ -107,7 +108,7 @@ def make_repackage_signing_description(config, jobs):
         task = {
             'label': label,
             'description': description,
-            'worker-type': 'linux-signing',
+            'worker-type': get_worker_type_for_scope(config, signing_cert_scope),
             'worker': {'implementation': 'scriptworker-signing',
                        'upstream-artifacts': upstream_artifacts,
                        'max-run-time': 3600},

taskcluster/taskgraph/transforms/repackage_signing_partner.py

@@ -13,6 +13,7 @@ from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.partners import check_if_partners_enabled, get_partner_config_by_kind
 from taskgraph.util.scriptworker import (
     get_signing_cert_scope_per_platform,
+    get_worker_type_for_scope,
 )
 from taskgraph.util.taskcluster import get_artifact_path
 from taskgraph.transforms.task import task_description_schema
@@ -119,7 +120,7 @@ def make_repackage_signing_description(config, jobs):
         task = {
             'label': label,
             'description': description,
-            'worker-type': 'linux-signing',
+            'worker-type': get_worker_type_for_scope(config, signing_cert_scope),
             'worker': {'implementation': 'scriptworker-signing',
                        'upstream-artifacts': upstream_artifacts,
                        'max-run-time': 3600},

taskcluster/taskgraph/transforms/signing.py

@@ -14,6 +14,7 @@ from taskgraph.util.keyed_by import evaluate_keyed_by
 from taskgraph.util.schema import taskref_or_string
 from taskgraph.util.scriptworker import (
     get_signing_cert_scope_per_platform,
+    get_worker_type_for_scope,
 )
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Required, Optional
@@ -156,7 +157,7 @@ def make_task_description(config, jobs):
         signing_cert_scope = get_signing_cert_scope_per_platform(
             build_platform, is_nightly, config
         )
-        worker_type_alias = 'linux-signing' if is_nightly else 'linux-depsigning'
+        worker_type_alias = get_worker_type_for_scope(config, signing_cert_scope)
         mac_behavior = None
         task = {
             'label': label,

taskcluster/taskgraph/transforms/source_checksums_signing.py

@@ -1,3 +1,4 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 """
@@ -11,6 +12,7 @@ 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,
+    get_worker_type_for_scope,
 )
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Required, Optional
@@ -62,7 +64,7 @@ def make_checksums_signing_description(config, jobs):
         task = {
             'label': label,
             'description': description,
-            'worker-type': 'linux-signing',
+            'worker-type': get_worker_type_for_scope(config, signing_cert_scope),
             'worker': {'implementation': 'scriptworker-signing',
                        'upstream-artifacts': upstream_artifacts,
                        'max-run-time': 3600},

taskcluster/taskgraph/transforms/task.py

@@ -1824,8 +1824,7 @@ def build_task(config, tasks):
         provisioner_id, worker_type = get_worker_type(
             config.graph_config,
             task['worker-type'],
-            level=level,
-            release_level=config.params.release_level(),
+            level,
         )
         task['worker-type'] = '/'.join([provisioner_id, worker_type])
         project = config.params['project']

taskcluster/taskgraph/util/scriptworker.py

@@ -377,7 +377,7 @@ def get_release_config(config):
 def get_signing_cert_scope_per_platform(build_platform, is_nightly, config):
     if 'devedition' in build_platform:
         return get_devedition_signing_cert_scope(config)
-    elif is_nightly:
+    elif is_nightly or build_platform in ('firefox-source', 'fennec-source', 'thunderbird-source'):
         return get_signing_cert_scope(config)
     else:
         return add_scope_prefix(config, 'signing:cert:dep-signing')

taskcluster/taskgraph/util/workertypes.py

@@ -32,7 +32,7 @@ WORKER_TYPES = {
 
 
 @memoize
-def _get(graph_config, alias, level, release_level):
+def _get(graph_config, alias, level):
     """Get the configuration for this worker_type alias: {provisioner,
     worker-type, implementation, os}"""
     level = str(level)
@@ -69,23 +69,26 @@ def _get(graph_config, alias, level, release_level):
     worker_config['worker-type'] = evaluate_keyed_by(
         worker_config['worker-type'],
         "worker-type alias {} field worker-type".format(alias),
-        {"level": level, 'release-level': release_level}).format(level=level, alias=alias)
+        {"level": level}).format(level=level, alias=alias)
 
     return worker_config
 
 
+@memoize
 def worker_type_implementation(graph_config, worker_type):
     """Get the worker implementation and OS for the given workerType, where the
     OS represents the host system, not the target OS, in the case of
     cross-compiles."""
-    worker_config = _get(graph_config, worker_type, '1', 'staging')
+    worker_config = _get(graph_config, worker_type, '1')
     return worker_config['implementation'], worker_config.get('os')
 
 
-def get_worker_type(graph_config, worker_type, level, release_level):
+@memoize
+def get_worker_type(graph_config, worker_type, level):
     """
     Get the worker type provisioner and worker-type, optionally evaluating
     aliases from the graph config.
     """
-    worker_config = _get(graph_config, worker_type, level, release_level)
+    worker_config = _get(graph_config, worker_type, level)
+
     return worker_config['provisioner'], worker_config['worker-type']