Skip to content
Permalink
Browse files

Move all tasks to Community-TC

  • Loading branch information...
SimonSapin committed Nov 7, 2019
1 parent 1089f8f commit 9d85cbb65c5189c7894a5b28be8d3ea65c9d1854
Showing with 11 additions and 28 deletions.
  1. +6 −23 etc/taskcluster/decision_task.py
  2. +4 −4 etc/taskcluster/decisionlib.py
  3. +1 −1 etc/taskcluster/mock.py
@@ -10,6 +10,9 @@


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-" + (
@@ -72,26 +75,6 @@ def main(task_for):
android_x86_wpt
],
}
if not CONFIG.legacy_tc_deployment: # pragma: no cover
by_branch_name = {
"auto": [
# Everything not running on macOS,
# which only has one worker on Community-TC for now
linux_tidy_unit,
linux_docs_check,
windows_unit,
windows_arm64,
windows_uwp_x64,
android_arm32_dev,
android_arm32_release,
android_x86_wpt,
linux_wpt,
linux_release,
],
"master": [
upload_docs,
],
}
for function in by_branch_name.get(branch, []):
function()

@@ -913,7 +896,7 @@ def macos_build_task(name):
build_task = (
macos_task(name)
# Allow long runtime in case the cache expired for all those Homebrew dependencies
.with_max_run_time_minutes(60 * 2)
.with_max_run_time_minutes(60 * 4)
.with_env(**build_env, **unix_build_env, **macos_build_env)
.with_repo()
.with_python2()
@@ -1015,10 +998,10 @@ 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:
if CONFIG.legacy_tc_deployment: # pragma: no cover
CONFIG.index_prefix = "project.servo.servo"
CONFIG.docker_image_build_worker_type = "servo-docker-worker"
else: # pragma: no cover
else:
CONFIG.index_prefix = "project.servo"
CONFIG.default_provisioner_id = "proj-servo"
CONFIG.docker_image_build_worker_type = "docker"
@@ -60,9 +60,9 @@ def __init__(self):
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:
if self.legacy_tc_deployment: # pragma: no cover
self.default_provisioner_id = "aws-provisioner-v1"
else: # pragma: no cover
else:
self.default_provisioner_id = "proj-example"


@@ -620,9 +620,9 @@ 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:
if CONFIG.legacy_tc_deployment: # pragma: no cover
queue_service = "https://queue.taskcluster.net"
else: # pragma: no cover
else:
queue_service = CONFIG.tc_root_url + "/api/queue"
return self \
.with_dependencies(task_id) \
@@ -44,7 +44,7 @@ def findTask(self, path):
sys.dont_write_bytecode = True
os.environ.update(**{k: k for k in "TASK_ID TASK_OWNER TASK_SOURCE GIT_URL GIT_SHA".split()})
os.environ["GIT_REF"] = "refs/heads/auto"
os.environ["TASKCLUSTER_ROOT_URL"] = "https://taskcluster.net"
os.environ["TASKCLUSTER_ROOT_URL"] = "https://community-tc.services.mozilla.com"
os.environ["TASKCLUSTER_PROXY_URL"] = "http://taskcluster"
os.environ["NEW_AMI_WORKER_TYPE"] = "-"
import decision_task

0 comments on commit 9d85cbb

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