Bug 1542819: Use worker aliases for signing to unbreak TB. r=tomprince a=release
authorChris AtLee <catlee@mozilla.com>
Mon, 07 Oct 2019 18:47:40 +0000
changeset 555683 e19149a8ab7d79a0d66ef2d091558ef051b70a8f
parent 555682 48b17276d88528ca536aa422d5eabc984002b2e2
child 555684 a0c03214c1d5e58b6a0255a30b67c155a05bcb76
push id2185
push usermtabara@mozilla.com
push dateMon, 04 Nov 2019 19:27:34 +0000
treeherdermozilla-release@e19149a8ab7d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince, release
bugs1542819
milestone70.0.2
Bug 1542819: Use worker aliases for signing to unbreak TB. r=tomprince a=release Differential Revision: https://phabricator.services.mozilla.com/D48406
taskcluster/ci/config.yml
taskcluster/taskgraph/transforms/geckodriver_signing.py
taskcluster/taskgraph/transforms/signing.py
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -237,20 +237,20 @@ release-promotion:
             is-rc: true
             target-tasks-method: ship_desktop
             partial-updates: true
 
 scriptworker:
     # See additional configuration in taskcluster/taskgraph/util/scriptworker.py
     scope-prefix: 'project:releng'
     worker-types:
-        'scriptworker-k8s/gecko-3-signing':
+        'linux-signing':
             - 'project:releng:signing:cert:release-signing'
             - 'project:releng:signing:cert:nightly-signing'
-        'scriptworker-k8s/gecko-t-signing':
+        'linux-depsigning':
             - 'project:releng:signing:cert:dep-signing'
         'scriptworker-k8s/gecko-3-beetmover':
             - 'project:releng:beetmover:bucket:release'
             - 'project:releng:beetmover:bucket:nightly'
             - 'project:releng:beetmover:bucket:partner'
             - 'project:releng:beetmover:bucket:maven-production'
         'scriptworker-k8s/gecko-1-beetmover':
             - 'project:releng:beetmover:bucket:dep'
@@ -320,25 +320,25 @@ workers:
             os: windows
             worker-type: 'gecko-{level}-{alias}'
         images:
             provisioner: aws-provisioner-v1
             implementation: docker-worker
             os: linux
             worker-type: 'gecko-{level}-{alias}'
         linux-depsigning:
-            provisioner: scriptworker-prov-v1
+            provisioner: scriptworker-k8s
             implementation: scriptworker-signing
             os: linux
-            worker-type: depsigning
+            worker-type: gecko-t-signing
         linux-signing:
-            provisioner: scriptworker-prov-v1
+            provisioner: scriptworker-k8s
             implementation: scriptworker-signing
             os: linux
-            worker-type: signing-linux-v1
+            worker-type: gecko-3-signing
         mac-depsigning:
             provisioner: scriptworker-prov-v1
             implementation: scriptworker-iscript
             os: macosx
             worker-type: depsigning-mac-v1
         mac-signing:
             provisioner: scriptworker-prov-v1
             implementation: scriptworker-iscript
--- a/taskcluster/taskgraph/transforms/geckodriver_signing.py
+++ b/taskcluster/taskgraph/transforms/geckodriver_signing.py
@@ -79,20 +79,18 @@ def make_repackage_signing_description(c
             'attributes': attributes,
             'run-on-projects': dep_job.attributes.get('run_on_projects'),
             'treeherder': treeherder,
         }
 
         if build_platform.startswith('macosx'):
             worker_type = task['worker-type']
             worker_type_alias_map = {
-                'scriptworker-k8s/gecko-t-signing': 'mac-depsigning',
-                'scriptworker-k8s/gecko-3-signing': 'mac-signing',
-                'scriptworker-k8s/gecko-t-signing-dev': 'mac-depsigning',
-                'scriptworker-k8s/gecko-3-signing-dev': 'mac-signing',
+                'linux-depsigning': 'mac-depsigning',
+                'linux-signing': 'mac-signing',
             }
 
             assert worker_type in worker_type_alias_map, \
                 (
                     "Make sure to adjust the below worker_type_alias logic for "
                     "mac if you change the signing workerType aliases!"
                     " ({} not found in mapping)".format(worker_type)
                 )
--- a/taskcluster/taskgraph/transforms/signing.py
+++ b/taskcluster/taskgraph/transforms/signing.py
@@ -172,20 +172,18 @@ def make_task_description(config, jobs):
             'optimization': dep_job.optimization,
             'routes': job.get('routes', []),
             'shipping-product': job.get('shipping-product'),
             'shipping-phase': job.get('shipping-phase'),
         }
 
         if 'macosx' in build_platform:
             worker_type_alias_map = {
-                'scriptworker-k8s/gecko-t-signing': 'mac-depsigning',
-                'scriptworker-k8s/gecko-3-signing': 'mac-signing',
-                'scriptworker-k8s/gecko-t-signing-dev': 'mac-depsigning',
-                'scriptworker-k8s/gecko-3-signing-dev': 'mac-signing',
+                'linux-depsigning': 'mac-depsigning',
+                'linux-signing': 'mac-signing',
             }
 
             assert worker_type_alias in worker_type_alias_map, \
                 (
                     "Make sure to adjust the below worker_type_alias logic for "
                     "mac if you change the signing workerType aliases!"
                     " ({} not found in mapping)".format(worker_type_alias)
                 )