From 960cb50ffdffd2cf090b1ca71fa4611525c3a963 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 11 Oct 2018 18:31:37 +0200 Subject: [PATCH 1/2] Taskcluster: use servo-* cache names --- etc/taskcluster/decision_task.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 24aa16ac629..954cb0ab9d5 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -249,13 +249,12 @@ def linux_build_task(name): return ( linux_task(name) # https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/caches - # FIMXE: move to servo-* cache names - .with_scopes("docker-worker:cache:cargo-*") + .with_scopes("docker-worker:cache:servo-*") .with_caches(**{ - "cargo-registry-cache": "/root/.cargo/registry", - "cargo-git-cache": "/root/.cargo/git", - "cargo-rustup": "/root/.rustup", - "cargo-sccache": "/root/.cache/sccache", + "servo-cargo-registry": "/root/.cargo/registry", + "servo-cargo-git": "/root/.cargo/git", + "servo-rustup": "/root/.rustup", + "servo-sccache": "/root/.cache/sccache", }) .with_index_and_artifacts_expire_in(build_artifacts_expire_in) .with_max_run_time_minutes(60) From 60eff32c9b251661d623f86acb86a26f97e6adf5 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 11 Oct 2018 18:33:07 +0200 Subject: [PATCH 2/2] Taskcluster: cache ~/.gradle This is where are kept files whose downloads sometimes fail, so downloading less often will reduce the impact of those failures. ``` > Could not get resource 'https://jcenter.bintray.com/com/android/tools/build/gradle/3.1.3/gradle-3.1.3.pom'. > Could not GET 'https://jcenter.bintray.com/com/android/tools/build/gradle/3.1.3/gradle-3.1.3.pom'. > Read timed out ``` https://tools.taskcluster.net/groups/PGuIkH5QQmqghZozhVtmoQ/tasks/CBa6IbLmQJqYgoswRn-hiw/runs/0/logs/public%2Flogs%2Flive.log#L3411 --- .taskcluster.yml | 2 +- etc/taskcluster/decision_task.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.taskcluster.yml b/.taskcluster.yml index 098a1414fe7..2dbaed6cd2b 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -28,7 +28,7 @@ tasks: # Granted to role "repo:github.com/servo/servo:branch:*" - "queue:create-task:highest:aws-provisioner-v1/servo-*" - "queue:route:index.project.servo.servo.*" - - "docker-worker:cache:cargo-*" + - "docker-worker:cache:servo-*" payload: maxRunTime: {$eval: '20 * 60'} diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 954cb0ab9d5..aa3c5d0723f 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -255,6 +255,7 @@ def linux_build_task(name): "servo-cargo-git": "/root/.cargo/git", "servo-rustup": "/root/.rustup", "servo-sccache": "/root/.cache/sccache", + "servo-gradle": "/root/.gradle", }) .with_index_and_artifacts_expire_in(build_artifacts_expire_in) .with_max_run_time_minutes(60)