From 9cdca07a2094ae55ace7efede5c63aaa393e07c4 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Tue, 23 Dec 2025 12:11:21 +0100
Subject: [PATCH] chore: migrate CI tasks to d2g worker pools

---
 .taskcluster.yml          | 34 +++++++++++++++++-----------------
 taskcluster/ci/config.yml |  4 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 47a5a30..f946137 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -115,7 +115,7 @@ tasks:
                                     description: 'Created by a [cron task](https://firefox-ci-tc.services.mozilla.com/tasks/${cron.task_id})'
 
                   provisionerId: "${trustDomain}-${level}"
-                  workerType: "decision-gcp"
+                  workerType: "decision"
 
                   tags:
                       $switch:
@@ -263,19 +263,19 @@ tasks:
                                   # debugging, but they are not useful long-term.
                                   expires: {$fromNow: '7 day'}
 
-                          extra:
-                              $merge:
-                                  - $if: 'tasks_for == "action"'
-                                    then:
-                                        parent: '${action.taskGroupId}'
-                                        action:
-                                            name: '${action.name}'
-                                            context:
-                                                taskGroupId: '${action.taskGroupId}'
-                                                taskId: {$eval: 'taskId'}
-                                                input: {$eval: 'input'}
-                                                clientId: {$eval: 'clientId'}
-                                  - $if: 'tasks_for == "cron"'
-                                    then:
-                                        cron: {$json: {$eval: 'cron'}}
-                                  - tasks_for: '${tasks_for}'
+                  extra:
+                      $merge:
+                          - $if: 'tasks_for == "action"'
+                            then:
+                                parent: '${action.taskGroupId}'
+                                action:
+                                    name: '${action.name}'
+                                    context:
+                                        taskGroupId: '${action.taskGroupId}'
+                                        taskId: {$eval: 'taskId'}
+                                        input: {$eval: 'input'}
+                                        clientId: {$eval: 'clientId'}
+                          - $if: 'tasks_for == "cron"'
+                            then:
+                                cron: {$json: {$eval: 'cron'}}
+                          - tasks_for: '${tasks_for}'
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 08bb848..29f8de9 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -14,9 +14,9 @@ workers:
       provisioner: '{trust-domain}-{level}'
       implementation: docker-worker
       os: linux
-      worker-type: '{alias}-gcp'
+      worker-type: '{alias}'
     linux:
       provisioner: '{trust-domain}-t'
       implementation: docker-worker
       os: linux
-      worker-type: 't-{alias}-large-gcp'
+      worker-type: 't-{alias}-docker'