Skip to content
Permalink
Browse files

Remove support for taskcluster.net in the decision task

  • Loading branch information...
SimonSapin committed Nov 8, 2019
1 parent 8cb6145 commit b3faeb5483593acec2ff15a19503d1b255214884
Showing with 8 additions and 25 deletions.
  1. +6 −15 etc/taskcluster/decision_task.py
  2. +2 −10 etc/taskcluster/decisionlib.py
@@ -10,9 +10,6 @@


def main(task_for):
if CONFIG.legacy_tc_deployment: # pragma: no cover
return

if CONFIG.git_ref.startswith("refs/heads/"):
branch = CONFIG.git_ref[len("refs/heads/"):]
CONFIG.treeherder_repository_name = "servo-" + (
@@ -165,9 +162,7 @@ def mocked_only():
def linux_tidy_unit_untrusted():
return (
decisionlib.DockerWorkerTask("Tidy + dev build + unit tests")
.with_worker_type(
"servo-docker-untrusted" if CONFIG.legacy_tc_deployment else "docker-untrusted"
)
.with_worker_type("docker-untrusted")
.with_treeherder("Linux x64", "Tidy+Unit")
.with_max_run_time_minutes(60)
.with_dockerfile(dockerfile_path("build"))
@@ -755,14 +750,14 @@ def dockerfile_path(name):
def linux_task(name):
return (
decisionlib.DockerWorkerTask(name)
.with_worker_type("servo-docker-worker" if CONFIG.legacy_tc_deployment else "docker")
.with_worker_type("docker")
.with_treeherder_required()
)


def windows_task(name, worker_type=None):
if worker_type is None:
worker_type = "servo-win2016" if CONFIG.legacy_tc_deployment else "win2016"
worker_type = "win2016"
return (
decisionlib.WindowsGenericWorkerTask(name)
.with_worker_type(worker_type)
@@ -998,13 +993,9 @@ def magicleap_nightly():
CONFIG.task_name_template = "Servo: %s"
CONFIG.docker_images_expire_in = build_dependencies_artifacts_expire_in
CONFIG.repacked_msi_files_expire_in = build_dependencies_artifacts_expire_in
if CONFIG.legacy_tc_deployment: # pragma: no cover
CONFIG.index_prefix = "project.servo.servo"
CONFIG.docker_image_build_worker_type = "servo-docker-worker"
else:
CONFIG.index_prefix = "project.servo"
CONFIG.default_provisioner_id = "proj-servo"
CONFIG.docker_image_build_worker_type = "docker"
CONFIG.index_prefix = "project.servo"
CONFIG.default_provisioner_id = "proj-servo"
CONFIG.docker_image_build_worker_type = "docker"


if __name__ == "__main__": # pragma: no cover
@@ -58,12 +58,7 @@ def __init__(self):
self.git_sha = os.environ.get("GIT_SHA")

self.tc_root_url = os.environ.get("TASKCLUSTER_ROOT_URL")
self.legacy_tc_deployment = self.tc_root_url == "https://taskcluster.net"

if self.legacy_tc_deployment: # pragma: no cover
self.default_provisioner_id = "aws-provisioner-v1"
else:
self.default_provisioner_id = "proj-example"
self.default_provisioner_id = "proj-example"


def task_id(self):
@@ -620,10 +615,7 @@ def with_curl_script(self, url, file_path):
""".format(n=n))

def with_curl_artifact_script(self, task_id, artifact_name, out_directory=""):
if CONFIG.legacy_tc_deployment: # pragma: no cover
queue_service = "https://queue.taskcluster.net"
else:
queue_service = CONFIG.tc_root_url + "/api/queue"
queue_service = CONFIG.tc_root_url + "/api/queue"
return self \
.with_dependencies(task_id) \
.with_curl_script(

0 comments on commit b3faeb5

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