diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-11-10 17:43:58 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-11-10 17:43:58 +0100 |
| commit | fa1981ecbb92ad4e393c4a07819d08fcb4edac27 (patch) | |
| tree | 9986136145867ce8ec54b6a06a0aa6a235c80749 | |
| parent | 6b47ffc03a6efcee405320f205db317ba8b5fdc2 (diff) | |
| download | servo-fa1981ecbb92ad4e393c4a07819d08fcb4edac27.tar.gz servo-fa1981ecbb92ad4e393c4a07819d08fcb4edac27.zip | |
Revert "Always build Docker images on AWS"
This reverts commit 6b47ffc03a6efcee405320f205db317ba8b5fdc2.
| -rw-r--r-- | etc/taskcluster/decision_task.py | 1 | ||||
| -rw-r--r-- | etc/taskcluster/decisionlib.py | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index bc557c57ee8..b72eb64488b 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -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 diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py index 3dd1af32a3c..fb48ac3f018 100644 --- a/etc/taskcluster/decisionlib.py +++ b/etc/taskcluster/decisionlib.py @@ -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]
\ No newline at end of file |