From 7b90a5bf55ced3d999e4ac7e43928c1b09ee81c7 Mon Sep 17 00:00:00 2001
From: Mitchell Hentges <mhentges@mozilla.com>
Date: Fri, 8 Nov 2019 14:09:30 -0800
Subject: [PATCH] Switch to aws-provider worker types (#6501)

---
 .taskcluster.yml          | 6 +++---
 taskcluster/ci/config.yml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index b8a3ba3b3..545e7086b 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -8,7 +8,7 @@ tasks:
     - $let:
           taskgraph:
               branch: taskgraph
-              revision: 0c5a68749f9a7672a7e56604b69a7bd41b036614
+              revision: 8724fdf41562f6eea82d1b905072d4a7c1f5ebbf
           trustDomain: mobile
       in:
           $let:
@@ -129,8 +129,8 @@ tasks:
                                     else:
                                         name: "Decision Task for cron job ${cron.job_name}"
                                         description: 'Created by a [cron task](https://tools.taskcluster.net/tasks/${cron.task_id})'
-                      provisionerId: "aws-provisioner-v1"
-                      workerType: "mobile-${level}-decision"
+                      provisionerId: "mobile-${level}"
+                      workerType: "decision"
                       tags:
                           $if: 'tasks_for in ["github-push", "github-pull-request"]'
                           then:
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 4d7a7c1d8..475ecf763 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -25,15 +25,15 @@ taskgraph:
 workers:
     aliases:
         b-android:
-            provisioner: aws-provisioner-v1
+            provisioner: 'mobile-{level}'
             implementation: docker-worker
             os: linux
-            worker-type: 'mobile-{level}-b-fenix'
+            worker-type: 'b-linux'
         images:
-            provisioner: aws-provisioner-v1
+            provisioner: 'mobile-{level}'
             implementation: docker-worker
             os: linux
-            worker-type: 'mobile-{level}-images'
+            worker-type: 'images'
         dep-signing:
             provisioner: scriptworker-prov-v1
             implementation: scriptworker-signing