Bug 1595153 - [firefox-ci] Switch to using aws-provider workers; r=rjl
authorTom Prince <mozilla@hocat.ca>
Fri, 08 Nov 2019 21:02:58 +0000
changeset 37266 b688e3f9c08f4cb656f505cab324373dc1797770
parent 37265 a499bbe26a5e2ff15b8b8e381512488668517bb4
child 37267 44441141040254f8c5576a90bf01477e6f8029b6
push id395
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:38:57 +0000
reviewersrjl
bugs1595153
Bug 1595153 - [firefox-ci] Switch to using aws-provider workers; r=rjl Differential Revision: https://phabricator.services.mozilla.com/D52225 (grafted from a3bc2a8807dbeab553d1c5747558da30c72e9b4f)
taskcluster/ci/config.yml
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -90,30 +90,30 @@ task-priority:
         'comm-(esr60|esr68)': 'very-high'
         'comm-beta': 'high'
         'comm-central': 'medium'
         'default': 'low'
 
 workers:
     aliases:
         b-linux.*:
-            provisioner: aws-provisioner-v1
+            provisioner: 'comm-{level}'
             implementation: docker-worker
             os: linux
-            worker-type: 'gecko-{level}-{alias}'
+            worker-type: '{alias}'
         b-win2012:
-            provisioner: aws-provisioner-v1
+            provisioner: 'comm-{level}'
             implementation: generic-worker
             os: windows
-            worker-type: 'gecko-{level}-{alias}'
+            worker-type: '{alias}'
         images:
-            provisioner: aws-provisioner-v1
+            provisioner: 'comm-{level}'
             implementation: docker-worker
             os: linux
-            worker-type: 'gecko-{level}-{alias}'
+            worker-type: '{alias}'
         linux-depsigning:
             provisioner: scriptworker-prov-v1
             implementation: scriptworker-signing
             os: linux
             worker-type: tb-depsigning
         linux-signing:
             provisioner: scriptworker-prov-v1
             implementation: scriptworker-signing
@@ -125,40 +125,35 @@ workers:
             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
         t-linux(-large|-xlarge):
-            provisioner: aws-provisioner-v1
+            provisioner: comm-t
             implementation: docker-worker
             os: linux
-            worker-type: 'gecko-{alias}'
+            worker-type: '{alias}'
         t-osx-1010:
             provisioner: releng-hardware
             implementation: generic-worker
             os: macosx
             worker-type: 'gecko-{alias}'
         t-osx-1014:
             provisioner: releng-hardware
             implementation: generic-worker
             os: macosx
             worker-type: 'gecko-{alias}'
-        t-win10-64(|-gpu):
-            provisioner: aws-provisioner-v1
+        t-win.*:
+            provisioner: comm-t
             implementation: generic-worker
             os: windows
-            worker-type: 'gecko-{alias}'
-        t-win7-32(|-gpu):
-            provisioner: aws-provisioner-v1
-            implementation: generic-worker
-            os: windows
-            worker-type: 'gecko-{alias}'
+            worker-type: '{alias}'
         succeed:
             provisioner: built-in
             implementation: succeed
             os: none
             worker-type: succeed
 
 mac-notarization:
     mac-behavior: