From 3747d931bbb46879e892b0a8f5c11b89231f61cb Mon Sep 17 00:00:00 2001
From: Gregory Arndt <garndt@mozilla.com>
Date: Mon, 10 Aug 2015 21:16:59 -0500
Subject: [PATCH] Bug 1132574 - Use per branch cache for b2g and mulet builders
 r=jonasfj

--HG--
extra : commitid : 7P8WGpK0eHF
extra : rebase_source : 4f2bc9d92635dcffc0d29c4176837314ba5700c6
---
 testing/taskcluster/tasks/builds/b2g_desktop_debug.yml | 4 ++--
 testing/taskcluster/tasks/builds/b2g_desktop_opt.yml   | 4 ++--
 testing/taskcluster/tasks/builds/mulet_linux.yml       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml
index 4ac570bad47f..f2ee13419513 100644
--- a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml
@@ -6,7 +6,7 @@ $inherits:
 
 task:
   scopes:
-      - 'docker-worker:cache:workspace-b2g-desktop-objects-debug'
+    - 'docker-worker:cache:workspace-{{project}}-b2g-desktop-objects-debug'
   workerType: b2g-desktop-debug
   extra:
     treeherder:
@@ -15,6 +15,6 @@ task:
 
   payload:
     cache:
-      workspace-b2g-desktop-objects-debug: '/home/worker/workspace'
+      workspace-{{project}}-b2g-desktop-objects-debug: '/home/worker/workspace'
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/debug'
diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml b/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml
index 61f8643fdc05..35c9752a4153 100644
--- a/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml
@@ -5,7 +5,7 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:workspace-b2g-desktop-objects-opt'
+    - 'docker-worker:cache:workspace-{{project}}-b2g-desktop-objects-opt'
   routes:
     - 'index.buildbot.branches.{{project}}.linux64_gecko'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64_gecko'
@@ -13,7 +13,7 @@ task:
   workerType: b2g-desktop-opt
   payload:
     cache:
-      workspace-b2g-desktop-objects-opt: '/home/worker/workspace'
+      workspace-{{project}}-b2g-desktop-objects-opt: '/home/worker/workspace'
 
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly'
diff --git a/testing/taskcluster/tasks/builds/mulet_linux.yml b/testing/taskcluster/tasks/builds/mulet_linux.yml
index 9650fb07453f..1e0654404bfc 100644
--- a/testing/taskcluster/tasks/builds/mulet_linux.yml
+++ b/testing/taskcluster/tasks/builds/mulet_linux.yml
@@ -15,13 +15,13 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-mulet'
 
   scopes:
-    - 'docker-worker:cache:build-mulet-linux-workspace'
+    - 'docker-worker:cache:build-mulet-linux-{{project}}-workspace'
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
     cache:
-      build-mulet-linux-workspace: '/home/worker/workspace'
+      build-mulet-linux-{{project}}-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tools/tooltool-cache'
 
     features: