Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove support for taskcluster.net in the decision task

Browse source
This commit is contained in:
Simon Sapin 2019-11-08 16:19:46 +01:00
parent 8cb6145311
commit b3faeb5483
2 changed files with 8 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

21
etc/taskcluster/decision_task.py
View file

@ -10,9 +10,6 @@ from decisionlib import CONFIG, SHARED
def main(task_for): def main(task_for):
if CONFIG.legacy_tc_deployment: # pragma: no cover
return
if CONFIG.git_ref.startswith("refs/heads/"): if CONFIG.git_ref.startswith("refs/heads/"):
branch = CONFIG.git_ref[len("refs/heads/"):] branch = CONFIG.git_ref[len("refs/heads/"):]
CONFIG.treeherder_repository_name = "servo-" + ( CONFIG.treeherder_repository_name = "servo-" + (
@ -165,9 +162,7 @@ windows_sparse_checkout = [
def linux_tidy_unit_untrusted(): def linux_tidy_unit_untrusted():
return ( return (
decisionlib.DockerWorkerTask("Tidy + dev build + unit tests") decisionlib.DockerWorkerTask("Tidy + dev build + unit tests")
.with_worker_type( .with_worker_type("docker-untrusted")
"servo-docker-untrusted" if CONFIG.legacy_tc_deployment else "docker-untrusted"
)
.with_treeherder("Linux x64", "Tidy+Unit") .with_treeherder("Linux x64", "Tidy+Unit")
.with_max_run_time_minutes(60) .with_max_run_time_minutes(60)
.with_dockerfile(dockerfile_path("build")) .with_dockerfile(dockerfile_path("build"))
@ -755,14 +750,14 @@ def dockerfile_path(name):
def linux_task(name): def linux_task(name):
return ( return (
decisionlib.DockerWorkerTask(name) decisionlib.DockerWorkerTask(name)
.with_worker_type("servo-docker-worker" if CONFIG.legacy_tc_deployment else "docker") .with_worker_type("docker")
.with_treeherder_required() .with_treeherder_required()
) )
def windows_task(name, worker_type=None): def windows_task(name, worker_type=None):
if worker_type is None: if worker_type is None:
worker_type = "servo-win2016" if CONFIG.legacy_tc_deployment else "win2016" worker_type = "win2016"
return ( return (
decisionlib.WindowsGenericWorkerTask(name) decisionlib.WindowsGenericWorkerTask(name)
.with_worker_type(worker_type) .with_worker_type(worker_type)
@ -998,13 +993,9 @@ def magicleap_nightly():
CONFIG.task_name_template = "Servo: %s" CONFIG.task_name_template = "Servo: %s"
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
if CONFIG.legacy_tc_deployment: # pragma: no cover CONFIG.index_prefix = "project.servo"
CONFIG.index_prefix = "project.servo.servo" CONFIG.default_provisioner_id = "proj-servo"
CONFIG.docker_image_build_worker_type = "servo-docker-worker" CONFIG.docker_image_build_worker_type = "docker"
else:
CONFIG.index_prefix = "project.servo"
CONFIG.default_provisioner_id = "proj-servo"
CONFIG.docker_image_build_worker_type = "docker"
if __name__ == "__main__": # pragma: no cover if __name__ == "__main__": # pragma: no cover

12
etc/taskcluster/decisionlib.py
View file

@ -58,12 +58,7 @@ class Config:
self.git_sha = os.environ.get("GIT_SHA") self.git_sha = os.environ.get("GIT_SHA")
self.tc_root_url = os.environ.get("TASKCLUSTER_ROOT_URL") self.tc_root_url = os.environ.get("TASKCLUSTER_ROOT_URL")
self.legacy_tc_deployment = self.tc_root_url == "https://taskcluster.net" self.default_provisioner_id = "proj-example"
if self.legacy_tc_deployment: # pragma: no cover
self.default_provisioner_id = "aws-provisioner-v1"
else:
self.default_provisioner_id = "proj-example"
def task_id(self): def task_id(self):
@ -620,10 +615,7 @@ class UnixTaskMixin(Task):
""".format(n=n)) """.format(n=n))
def with_curl_artifact_script(self, task_id, artifact_name, out_directory=""): def with_curl_artifact_script(self, task_id, artifact_name, out_directory=""):
if CONFIG.legacy_tc_deployment: # pragma: no cover queue_service = CONFIG.tc_root_url + "/api/queue"
queue_service = "https://queue.taskcluster.net"
else:
queue_service = CONFIG.tc_root_url + "/api/queue"
return self \ return self \
.with_dependencies(task_id) \ .with_dependencies(task_id) \
.with_curl_script( .with_curl_script(