Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Always build Docker images on AWS"

Browse source 
This reverts commit 6b47ffc03a.
This commit is contained in:
Simon Sapin 2018-11-10 17:43:58 +01:00
parent 6b47ffc03a
commit fa1981ecbb
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
etc/taskcluster/decision_task.py
View file

@ -327,7 +327,6 @@ 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

5
etc/taskcluster/decisionlib.py
View file

@ -40,7 +40,6 @@ 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"
@ -628,7 +627,7 @@ class DockerWorkerTask(Task):
image_build_task = (
DockerWorkerTask("Docker image: " + image_name)
.with_worker_type(CONFIG.docker_image_buil_worker_type or self.worker_type)
.with_worker_type(self.worker_type)
.with_max_run_time_minutes(30)
.with_index_and_artifacts_expire_in(CONFIG.docker_images_expire_in)
.with_features("dind")
@ -695,4 +694,4 @@ def deindent(string):
def url_basename(url):
return url.rpartition("/")[-1]
return url.rpartition("/")[-1]