Skip to content
Permalink
Browse files

Use provided docker builder worker for github PR tasks.

  • Loading branch information...
jdm committed Mar 26, 2019
1 parent f45bea7 commit 03f79b241cca15ce9d0e159db38c8e38a6566d9f
Showing with 4 additions and 3 deletions.
  1. +2 −1 etc/taskcluster/decision_task.py
  2. +2 −2 etc/taskcluster/decisionlib.py
@@ -75,6 +75,7 @@ def main(task_for):
elif task_for == "github-pull-request":
CONFIG.treeherder_repository_name = "servo-prs"
CONFIG.index_read_only = True
CONFIG.docker_image_build_worker_type = None

# We want the merge commit that GitHub creates for the PR.
# The event does contain a `pull_request.merge_commit_sha` key, but it is wrong:
@@ -625,7 +626,7 @@ def macos_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_image_build_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

@@ -41,7 +41,7 @@ def __init__(self):
self.index_read_only = False
self.scopes_for_all_subtasks = []
self.routes_for_all_subtasks = []
self.docker_image_buil_worker_type = None
self.docker_image_build_worker_type = None
self.docker_images_expire_in = "1 month"
self.repacked_msi_files_expire_in = "1 month"
self.treeherder_repository_name = None
@@ -723,7 +723,7 @@ def with_dockerfile(self, dockerfile):

image_build_task = (
DockerWorkerTask("Docker image: " + image_name)
.with_worker_type(CONFIG.docker_image_buil_worker_type or self.worker_type)
.with_worker_type(CONFIG.docker_image_build_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")

0 comments on commit 03f79b2

Please sign in to comment.
You can’t perform that action at this time.