Always build Docker images on AWS

This commit is contained in:
Simon Sapin 2018-11-10 17:39:18 +01:00
parent b1822a39fa
commit b0d13cc254
2 changed files with 4 additions and 2 deletions

View file

@ -327,6 +327,7 @@ def windows_build_task(name):
CONFIG.task_name_template = "Servo: %s" CONFIG.task_name_template = "Servo: %s"
CONFIG.index_prefix = "project.servo.servo" 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.docker_images_expire_in = build_dependencies_artifacts_expire_in
CONFIG.repacked_msi_files_expire_in = build_dependencies_artifacts_expire_in CONFIG.repacked_msi_files_expire_in = build_dependencies_artifacts_expire_in

View file

@ -40,6 +40,7 @@ class Config:
self.index_prefix = "garbage.servo-decisionlib" self.index_prefix = "garbage.servo-decisionlib"
self.scopes_for_all_subtasks = [] self.scopes_for_all_subtasks = []
self.routes_for_all_subtasks = [] self.routes_for_all_subtasks = []
self.docker_image_buil_worker_type = None
self.docker_images_expire_in = "1 month" self.docker_images_expire_in = "1 month"
self.repacked_msi_files_expire_in = "1 month" self.repacked_msi_files_expire_in = "1 month"
@ -627,7 +628,7 @@ class DockerWorkerTask(Task):
image_build_task = ( image_build_task = (
DockerWorkerTask("Docker image: " + image_name) 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_max_run_time_minutes(30)
.with_index_and_artifacts_expire_in(CONFIG.docker_images_expire_in) .with_index_and_artifacts_expire_in(CONFIG.docker_images_expire_in)
.with_features("dind") .with_features("dind")