Bug 1606385 - Port bug 1605275: Adjust how signing workers are selected. r=darktrojan BETA_BASE_20200106
authorRob Lemley <rob@thunderbird.net>
Fri, 03 Jan 2020 22:13:42 -0500
changeset 36985 6ad2d9a2db6612a46cffc9395e6cfd39a19140e9
parent 36984 2e4a2383f3182d3befbcee92c0ef2ba7347eb23d
child 36986 dcbd7c2f06e39c37080d8971462de904a2f07bc3
push id2543
push userclokep@gmail.com
push dateMon, 06 Jan 2020 23:26:40 +0000
treeherdercomm-beta@323890d47ddf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan
bugs1606385, 1605275
Bug 1606385 - Port bug 1605275: Adjust how signing workers are selected. r=darktrojan Updates scopes for staging signing jobs (try-c-c). Most of the time try-c-c builds do not use these scopes. They are used when testing the complete daily build graph or release promotion.
taskcluster/ci/config.yml
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -58,21 +58,16 @@ release-promotion:
             product: thunderbird
             target-tasks-method: ship_desktop
             version-bump: true
 
 scriptworker:
     scope-prefix: 'project:comm:thunderbird:releng'
 
     worker-types:
-        'linux-depsigning':
-            - 'project:comm:thunderbird:releng:signing:cert:dep-signing'
-        'linux-signing':
-            - 'project:comm:thunderbird:releng:signing:cert:nightly-signing'
-            - 'project:comm:thunderbird:releng:signing:cert:release-signing'
         'scriptworker-k8s/comm-1-beetmover':
             - 'project:comm:thunderbird:releng:beetmover:bucket:dep'
         'scriptworker-k8s/comm-3-beetmover':
             - 'project:comm:thunderbird:releng:beetmover:bucket:nightly'
             - 'project:comm:thunderbird:releng:beetmover:bucket:release'
         'scriptworker-k8s/comm-1-balrog':
             - 'project:comm:thunderbird:releng:balrog:server:dep'
         'scriptworker-k8s/comm-3-balrog':
@@ -112,27 +107,33 @@ workers:
             provisioner: scriptworker-k8s
             implementation: scriptworker-signing
             os: linux
             worker-type: comm-t-signing
         linux-signing:
             provisioner: scriptworker-k8s
             implementation: scriptworker-signing
             os: linux
-            worker-type: comm-3-signing
+            worker-type:
+                by-release-level:
+                    production: comm-3-signing
+                    staging: comm-t-signing
         mac-depsigning:
             provisioner: scriptworker-prov-v1
             implementation: scriptworker-iscript
             os: macosx
             worker-type: tb-depsigning-mac-v1
         mac-signing:
             provisioner: scriptworker-prov-v1
             implementation: scriptworker-iscript
             os: macosx
-            worker-type: tb-signing-mac-v1
+            worker-type:
+                by-release-level:
+                    production: tb-signing-mac-v1
+                    staging: tb-depsigning-mac-v1
         t-linux(-large|-xlarge):
             provisioner: comm-t
             implementation: docker-worker
             os: linux
             worker-type: '{alias}'
         t-osx-1010:
             provisioner: releng-hardware
             implementation: generic-worker