Always build Docker images on AWS

2 files changed, 4 insertions, 2 deletions

diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index b72eb64488b..bc557c57ee8 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -327,6 +327,7 @@ def windows_build_task(name):
 
 CONFIG.task_name_template = "Servo: %s"
 CONFIG.index_prefix = "project.servo.servo"
+CONFIG.docker_image_buil_worker_type = "servo-docker-worker"
 CONFIG.docker_images_expire_in = build_dependencies_artifacts_expire_in
 CONFIG.repacked_msi_files_expire_in = build_dependencies_artifacts_expire_in
 
diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py
index fb48ac3f018..3dd1af32a3c 100644
--- a/etc/taskcluster/decisionlib.py
+++ b/etc/taskcluster/decisionlib.py
@@ -40,6 +40,7 @@ class Config:
         self.index_prefix = "garbage.servo-decisionlib"
         self.scopes_for_all_subtasks = []
         self.routes_for_all_subtasks = []
+        self.docker_image_buil_worker_type = None
         self.docker_images_expire_in = "1 month"
         self.repacked_msi_files_expire_in = "1 month"
 
@@ -627,7 +628,7 @@ class DockerWorkerTask(Task):
 
         image_build_task = (
             DockerWorkerTask("Docker image: " + image_name)
-            .with_worker_type(self.worker_type)
+            .with_worker_type(CONFIG.docker_image_buil_worker_type or self.worker_type)
             .with_max_run_time_minutes(30)
             .with_index_and_artifacts_expire_in(CONFIG.docker_images_expire_in)
             .with_features("dind")
@@ -694,4 +695,4 @@ def deindent(string):
 
 
 def url_basename(url):
-    return url.rpartition("/")[-1]
\ No newline at end of file
+    return url.rpartition("/")[-1]