Bug 1213878 - Make caches for linux and android builds branch specific r=wcosta
authorGregory Arndt <garndt@mozilla.com>
Mon, 12 Oct 2015 10:32:25 -0500
changeset 267431 3ffdf927915636d3e09d630c65be5e8b903438bd
parent 267430 c604f20cb9165869d98cd191ad129689df61b2f7
child 267432 4179e0be0f071a6ac70a4c65765a8b6b04e76552
push id29519
push usercbook@mozilla.com
push dateWed, 14 Oct 2015 10:29:57 +0000
treeherdermozilla-central@6307530f9f1e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswcosta
bugs1213878
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1213878 - Make caches for linux and android builds branch specific r=wcosta
testing/taskcluster/tasks/builds/android_api_11.yml
testing/taskcluster/tasks/builds/android_api_11_b2gdroid.yml
testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml
testing/taskcluster/tasks/builds/dbg_linux32.yml
testing/taskcluster/tasks/builds/dbg_linux64.yml
testing/taskcluster/tasks/builds/opt_linux32.yml
testing/taskcluster/tasks/builds/opt_linux64.yml
testing/taskcluster/tasks/builds/opt_linux64_st-an.yml
--- a/testing/taskcluster/tasks/builds/android_api_11.yml
+++ b/testing/taskcluster/tasks/builds/android_api_11.yml
@@ -10,25 +10,25 @@ task:
 
   workerType: android-api-11
 
   routes:
     - 'index.buildbot.branches.{{project}}.android-api-11'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-11'
 
   scopes:
-    - 'docker-worker:cache:build-android-api-11-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-android-api-11-c6-workspace'
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
-      build-android-api-11-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-android-api-11-c6-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     features:
       relengAPIProxy: true
 
     env:
       # inputs to mozharness
       MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
--- a/testing/taskcluster/tasks/builds/android_api_11_b2gdroid.yml
+++ b/testing/taskcluster/tasks/builds/android_api_11_b2gdroid.yml
@@ -10,25 +10,25 @@ task:
 
   workerType: android-api-11
 
   routes:
     - 'index.buildbot.branches.{{project}}.android-api-11-b2gdroid'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-11-b2gdroid'
 
   scopes:
-    - 'docker-worker:cache:build-android-api-11-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-android-api-11-c6-workspace'
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
-      build-android-api-11-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-android-api-11-c6-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     features:
       relengAPIProxy: true
 
     env:
       # inputs to mozharness
       MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
--- a/testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml
+++ b/testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml
@@ -10,25 +10,25 @@ task:
 
   workerType: android-api-11
 
   routes:
     - 'index.buildbot.branches.{{project}}.android-api-11-partner-sample1'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-11-partner-sample1'
 
   scopes:
-    - 'docker-worker:cache:build-android-api-11-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-android-api-11-c6-workspace'
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
-      build-android-api-11-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-android-api-11-c6-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     features:
       relengAPIProxy: true
 
     env:
       # inputs to mozharness
       MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
--- a/testing/taskcluster/tasks/builds/dbg_linux32.yml
+++ b/testing/taskcluster/tasks/builds/dbg_linux32.yml
@@ -1,10 +1,10 @@
 $inherits:
   from: 'tasks/builds/dbg_linux32_clobber.yml'
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:build-linux32-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux32-c6-workspace'
 
   payload:
     cache:
-      build-linux32-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-linux32-c6-workspace: '/home/worker/workspace'
--- a/testing/taskcluster/tasks/builds/dbg_linux64.yml
+++ b/testing/taskcluster/tasks/builds/dbg_linux64.yml
@@ -1,10 +1,10 @@
 $inherits:
   from: 'tasks/builds/dbg_linux64_clobber.yml'
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:build-linux64-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux64-c6-workspace'
 
   payload:
     cache:
-      build-linux64-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-linux64-c6-workspace: '/home/worker/workspace'
--- a/testing/taskcluster/tasks/builds/opt_linux32.yml
+++ b/testing/taskcluster/tasks/builds/opt_linux32.yml
@@ -1,10 +1,10 @@
 $inherits:
   from: 'tasks/builds/opt_linux32_clobber.yml'
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:build-linux32-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux32-c6-workspace'
 
   payload:
     cache:
-      build-linux32-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-linux32-c6-workspace: '/home/worker/workspace'
--- a/testing/taskcluster/tasks/builds/opt_linux64.yml
+++ b/testing/taskcluster/tasks/builds/opt_linux64.yml
@@ -1,10 +1,10 @@
 $inherits:
   from: 'tasks/builds/opt_linux64_clobber.yml'
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:build-linux64-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux64-c6-workspace'
 
   payload:
     cache:
-      build-linux64-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-linux64-c6-workspace: '/home/worker/workspace'
--- a/testing/taskcluster/tasks/builds/opt_linux64_st-an.yml
+++ b/testing/taskcluster/tasks/builds/opt_linux64_st-an.yml
@@ -4,25 +4,25 @@
   variables:
     build_name: 'linux64-st-an'
 task:
   metadata:
       name: '[TC] Linux64 Static Analysis Opt'
       description: 'Linux64 Static Analysis Opt'
 
   scopes:
-    - 'docker-worker:cache:build-linux64-st-an-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux64-st-an-workspace'
 
   routes:
     - 'index.buildbot.branches.{{project}}.linux64-st-an'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-st-an'
 
   payload:
     cache:
-      build-linux64-st-an-workspace: '/home/worker/workspace'
+      build-{{project}}-linux64-st-an-workspace: '/home/worker/workspace'
     env:
       MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
       MOZHARNESS_CONFIG: 'builds/releng_sub_linux_configs/64_stat_and_opt.py balrog/production.py'
       DIST_UPLOADS: ''
       DIST_TARGET_UPLOADS: ''
 
   extra:
     treeherder: