Backed out changeset ea5f655fa812

--HG--
extra : commitid : 30hQ3D62W37
extra : rebase_source : 0b4c5af05825a512944345ba490d5119fd03fc54

testing/taskcluster/mach_commands.py

@@ -260,9 +260,6 @@ class Graph(object):
     @CommandArgument('--owner',
         required=True,
         help='email address of who owns this graph')
-    @CommandArgument('--level',
-        default="1",
-        help='SCM level of this repository')
     @CommandArgument('--extend-graph',
         action="store_true", dest="ci", help='Omit create graph arguments')
     @CommandArgument('--interactive',
@@ -349,7 +346,6 @@ class Graph(object):
             'month': pushdate[4:6],
             'day': pushdate[6:8],
             'owner': params['owner'],
-            'level': params['level'],
             'from_now': json_time_from_now,
             'now': current_json_time(),
             'revision_hash': params['revision_hash']
@@ -594,9 +590,6 @@ class CIBuild(object):
     @CommandArgument('--owner',
         default='foobar@mozilla.com',
         help='email address of who owns this graph')
-    @CommandArgument('--level',
-        default="1",
-        help='SCM level of this repository')
     @CommandArgument('build_task',
         help='path to build task definition')
     @CommandArgument('--interactive',
@@ -635,7 +628,6 @@ class CIBuild(object):
         build_parameters = dict(gaia_info().items() + {
             'docker_image': docker_image,
             'owner': params['owner'],
-            'level': params['level'],
             'from_now': json_time_from_now,
             'now': current_json_time(),
             'base_repository': params['base_repository'] or head_repository,

testing/taskcluster/tasks/build.yml

@@ -23,14 +23,14 @@ task:
   scopes:
     # Nearly all of our build tasks use tc-vcs so just include the scope across
     # the board.
-    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
+    - 'docker-worker:cache:tc-vcs'
 
   payload:
     # Two hours is long but covers edge cases (and matches bb based infra)
     maxRunTime: 7200
 
     cache:
-      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
+      tc-vcs: '/home/worker/.tc-vcs'
 
     # All builds share a common artifact directory for ease of uploading.
     artifacts:

testing/taskcluster/tasks/builds/android_api_11.yml

@@ -15,7 +15,7 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-11'
 
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-11-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'
@@ -23,7 +23,7 @@ task:
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
-      level-{{level}}-{{project}}-build-android-api-11-workspace: '/home/worker/workspace'
+      build-{{project}}-android-api-11-c6-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     features:

testing/taskcluster/tasks/builds/android_api_11_b2gdroid.yml

@@ -15,7 +15,7 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-11-b2gdroid'
 
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-11-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'
@@ -23,7 +23,7 @@ task:
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
-      level-{{level}}-{{project}}-build-android-api-11-workspace: '/home/worker/workspace'
+      build-{{project}}-android-api-11-c6-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     features:

testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml

@@ -15,7 +15,7 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-11-partner-sample1'
 
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-11-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'
@@ -23,7 +23,7 @@ task:
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
-      level-{{level}}-{{project}}-build-android-api-11-workspace: '/home/worker/workspace'
+      build-{{project}}-android-api-11-c6-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     features:

testing/taskcluster/tasks/builds/b2g_aries_eng.yml

@@ -5,15 +5,15 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-eng-objdir-gecko'
+    - 'docker-worker:cache:build-aries-eng'
+    - 'docker-worker:cache:build-aries-eng-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Aries Eng'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-aries-eng: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-eng-objdir-gecko: /home/worker/objdir-gecko
+      build-aries-eng: /home/worker/workspace
+      build-aries-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'aries'
       MOZHARNESS_CONFIG: b2g/taskcluster-phone-eng.py

testing/taskcluster/tasks/builds/b2g_aries_spark_debug.yml

@@ -6,15 +6,15 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-debug-objdir-gecko'
+    - 'docker-worker:cache:build-aries-debug'
+    - 'docker-worker:cache:build-aries-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Aries Debug'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-aries-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-debug-objdir-gecko: /home/worker/objdir-gecko
+      build-aries-debug: /home/worker/workspace
+      build-aries-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'aries'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml

@@ -7,12 +7,12 @@ task:
   metadata:
     name: '[TC] B2G Aries Dogfood'
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-dogfood'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-dogfood-objdir-gecko'
+    - 'docker-worker:cache:build-aries-spark-dogfood'
+    - 'docker-worker:cache:build-aries-spark-dogfood-objdir-gecko-{{project}}'
   payload:
     cache:
-      level-{{level}}-{{project}}-build-aries-spark-dogfood: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-spark-dogfood-objdir-gecko: /home/worker/objdir-gecko
+      build-aries-spark-dogfood: /home/worker/workspace
+      build-aries-spark-dogfood-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       VARIANT: userdebug
       DOGFOOD: 1

testing/taskcluster/tasks/builds/b2g_aries_spark_noril_opt.yml

@@ -6,15 +6,15 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt-objdir-gecko'
+    - 'docker-worker:cache:build-aries-opt'
+    - 'docker-worker:cache:build-aries-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Aries No RIL Opt'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-aries-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-opt-objdir-gecko: /home/worker/objdir-gecko
+      build-aries-opt: /home/worker/workspace
+      build-aries-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'aries'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml

@@ -6,15 +6,15 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt-objdir-gecko'
+    - 'docker-worker:cache:build-aries-opt'
+    - 'docker-worker:cache:build-aries-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Aries Opt'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-aries-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-opt-objdir-gecko: /home/worker/objdir-gecko
+      build-aries-opt: /home/worker/workspace
+      build-aries-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'aries'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml

@@ -7,12 +7,12 @@ task:
   metadata:
     name: '[TC] B2G Aries OTA (userdebug)'
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-debug-objdir-gecko'
+    - 'docker-worker:cache:build-aries-spark-ota-debug'
+    - 'docker-worker:cache:build-aries-spark-ota-debug-objdir-gecko-{{project}}'
   payload:
     cache:
-      level-{{level}}-{{project}}-build-aries-spark-ota-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-spark-ota-debug-objdir-gecko: /home/worker/objdir-gecko
+      build-aries-spark-ota-debug: /home/worker/workspace
+      build-aries-spark-ota-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       VARIANT: userdebug
       B2G_DEBUG: 0

testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml

@@ -7,12 +7,12 @@ task:
   metadata:
     name: '[TC] B2G Aries OTA (user)'
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-user'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-user-objdir-gecko'
+    - 'docker-worker:cache:build-aries-spark-ota-user'
+    - 'docker-worker:cache:build-aries-spark-ota-user-objdir-gecko-{{project}}'
   payload:
     cache:
-      level-{{level}}-{{project}}-build-aries-spark-ota-user: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-spark-ota-user-objdir-gecko: /home/worker/objdir-gecko
+      build-aries-spark-ota-user: /home/worker/workspace
+      build-aries-spark-ota-user-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       VARIANT: user
   extra:

testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml

@@ -5,7 +5,7 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-512-eng'
+    - 'docker-worker:cache:build-dolphin-512-eng'
   metadata:
     name: '[TC] B2G Dolphin 512 Eng'
 
@@ -19,7 +19,7 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-dolphin-512-eng: /home/worker/workspace
+      build-dolphin-512-eng: /home/worker/workspace
     env:
       TARGET: 'dolphin-512'
       VARIANT: eng

testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml

@@ -5,7 +5,7 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-512-opt'
+    - 'docker-worker:cache:build-dolphin-512-opt'
   metadata:
     name: '[TC] B2G Dolphin 512 Opt'
 
@@ -18,6 +18,6 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-dolphin-512-opt: /home/worker/workspace
+      build-dolphin-512-opt: /home/worker/workspace
     env:
       TARGET: 'dolphin-512'

testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml

@@ -5,7 +5,7 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-eng'
+    - 'docker-worker:cache:build-dolphin-eng'
   metadata:
     name: '[TC] B2G Dolphin Eng'
 
@@ -19,7 +19,7 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-dolphin-eng: /home/worker/workspace
+      build-dolphin-eng: /home/worker/workspace
     env:
       TARGET: 'dolphin'
       VARIANT: eng

testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml

@@ -5,7 +5,7 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-opt'
+    - 'docker-worker:cache:build-dolphin-opt'
   metadata:
     name: '[TC] B2G Dolphin Opt'
 
@@ -18,7 +18,7 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-dolphin-opt: /home/worker/workspace
+      build-dolphin-opt: /home/worker/workspace
     env:
       TARGET: 'dolphin'
 

testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml

@@ -6,8 +6,8 @@ $inherits:
 task:
   workerType: emulator-ics-debug
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-ics-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-ics-debug-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-ics-debug'
+    - 'docker-worker:cache:workspace-emulator-ics-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Emulator ICS (Debug)'
   extra:
@@ -24,8 +24,8 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-emulator-ics-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-ics-debug-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-ics-debug: /home/worker/workspace
+      workspace-emulator-ics-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator'
       B2G_DEBUG: 1

testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml

@@ -9,8 +9,8 @@ task:
     - 'index.buildbot.branches.{{project}}.emulator-ics'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.emulator-ics'
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-ics-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-ics-opt-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-ics-opt'
+    - 'docker-worker:cache:workspace-emulator-ics-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Emulator ICS (Opt)'
 
@@ -26,8 +26,8 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-emulator-ics-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-ics-opt-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-ics-opt: /home/worker/workspace
+      workspace-emulator-ics-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
 
     env:
       TARGET: 'emulator'

testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml

@@ -6,8 +6,8 @@ $inherits:
 task:
   workerType: emulator-jb-debug
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-jb-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-jb-debug-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-jb-debug'
+    - 'docker-worker:cache:workspace-emulator-jb-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Emulator JB (Debug)'
 
@@ -25,8 +25,8 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-emulator-jb-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-jb-debug-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-jb-debug: /home/worker/workspace
+      workspace-emulator-jb-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-jb'
       B2G_DEBUG: 1

testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml

@@ -6,8 +6,8 @@ $inherits:
 task:
   workerType: emulator-jb
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-jb-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-jb-opt-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-jb-opt'
+    - 'docker-worker:cache:workspace-emulator-jb-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G JB Emulator: (Opt)'
 
@@ -23,8 +23,8 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-emulator-jb-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-jb-opt-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-jb-opt: /home/worker/workspace
+      workspace-emulator-jb-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-jb'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-jb/releng-emulator-jb.tt'

testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml

@@ -6,8 +6,8 @@ $inherits:
 task:
   workerType: emulator-kk-debug
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-debug-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-kk-debug'
+    - 'docker-worker:cache:workspace-emulator-kk-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Emulator KK (Debug)'
 
@@ -25,8 +25,8 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-emulator-kk-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-kk-debug-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-kk-debug: /home/worker/workspace
+      workspace-emulator-kk-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-kk'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-kk/releng-emulator-kk.tt'

testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml

@@ -9,8 +9,8 @@ task:
     - 'index.buildbot.branches.{{project}}.emulator-kk'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.emulator-kk'
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-opt-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-kk-opt'
+    - 'docker-worker:cache:workspace-emulator-kk-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G KK Emulator (Opt)'
 
@@ -26,8 +26,8 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-emulator-kk-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-kk-opt-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-kk-opt: /home/worker/workspace
+      workspace-emulator-kk-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-kk'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-kk/releng-emulator-kk.tt'

testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml

@@ -6,8 +6,8 @@ $inherits:
 task:
   workerType: emulator-l-debug
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-debug-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-l-debug'
+    - 'docker-worker:cache:workspace-emulator-l-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Emulator L (Debug)'
 
@@ -25,8 +25,8 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-emulator-l-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-l-debug-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-l-debug: /home/worker/workspace
+      workspace-emulator-l-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-l'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-l/releng-emulator-l.tt'

testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml

@@ -6,8 +6,8 @@ $inherits:
 task:
   workerType: emulator-l
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-opt-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-l-opt'
+    - 'docker-worker:cache:workspace-emulator-l-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G L Emulator (Opt)'
 
@@ -23,8 +23,8 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-emulator-l-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-l-opt-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-l-opt: /home/worker/workspace
+      workspace-emulator-l-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-l'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-l/releng-emulator-l.tt'

testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_debug.yml

@@ -6,8 +6,8 @@ $inherits:
 task:
   workerType: emulator-x86-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-x86-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-x86-debug-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-kk-x86-debug'
+    - 'docker-worker:cache:workspace-emulator-kk-x86-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G KK X86 Emulator (Debug)'
 
@@ -25,8 +25,8 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-emulator-kk-x86-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-kk-x86-debug-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-kk-x86-debug: /home/worker/workspace
+      workspace-emulator-kk-x86-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-x86-kk'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-kk/releng-emulator-kk.tt'

testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml

@@ -6,8 +6,8 @@ $inherits:
 task:
   workerType: emulator-x86-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-x86-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-x86-opt-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-kk-x86-opt'
+    - 'docker-worker:cache:workspace-emulator-kk-x86-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G KK X86 Emulator (Opt)'
 
@@ -23,8 +23,8 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-emulator-kk-x86-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-kk-x86-opt-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-kk-x86-opt: /home/worker/workspace
+      workspace-emulator-kk-x86-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-x86-kk'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-kk/releng-emulator-kk.tt'

testing/taskcluster/tasks/builds/b2g_emulator_x86_l_opt.yml

@@ -6,8 +6,8 @@ $inherits:
 task:
   workerType: emulator-l
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-x86-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-x86-opt-objdir-gecko'
+    - 'docker-worker:cache:workspace-emulator-l-x86-opt'
+    - 'docker-worker:cache:workspace-emulator-l-x86-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G X86 L Emulator (Opt)'
 
@@ -30,8 +30,8 @@ task:
         buildbot_step 'Build' ./build-emulator-x86.sh $HOME/workspace
 
     cache:
-      level-{{level}}-{{project}}-emulator-l-x86-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-l-x86-opt-objdir-gecko: /home/worker/objdir-gecko
+      workspace-emulator-l-x86-opt: /home/worker/workspace
+      workspace-emulator-l-x86-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-x86-l'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-l/releng-emulator-l.tt'

testing/taskcluster/tasks/builds/b2g_flame_kk_debug.yml

@@ -6,15 +6,15 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-debug-objdir-gecko'
+    - 'docker-worker:cache:build-flame-kk-debug'
+    - 'docker-worker:cache:build-flame-kk-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Flame KK Debug'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-flame-kk-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-debug-objdir-gecko: /home/worker/objdir-gecko
+      build-flame-kk-debug: /home/worker/workspace
+      build-flame-kk-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'flame-kk'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml

@@ -5,15 +5,15 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-eng-objdir-gecko'
+    - 'docker-worker:cache:build-flame-kk-eng'
+    - 'docker-worker:cache:build-flame-kk-eng-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Flame KK Eng'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-flame-kk-eng: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-eng-objdir-gecko: /home/worker/objdir-gecko
+      build-flame-kk-eng: /home/worker/workspace
+      build-flame-kk-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'flame-kk'
   extra:

testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml

@@ -6,15 +6,15 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-opt-objdir-gecko'
+    - 'docker-worker:cache:build-flame-kk-opt'
+    - 'docker-worker:cache:build-flame-kk-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Flame KK Opt'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-flame-kk-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-opt-objdir-gecko: /home/worker/objdir-gecko
+      build-flame-kk-opt: /home/worker/workspace
+      build-flame-kk-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'flame-kk'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml

@@ -7,13 +7,13 @@ task:
   metadata:
     name: '[TC] B2G Flame KK OTA (userdebug)'
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-debug-objdir-gecko'
+    - 'docker-worker:cache:build-flame-kk-ota-debug'
+    - 'docker-worker:cache:build-flame-kk-ota-debug-objdir-gecko-{{project}}'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-flame-kk-ota-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-ota-debug-objdir-gecko: /home/worker/objdir-gecko
+      build-flame-kk-ota-debug: /home/worker/workspace
+      build-flame-kk-ota-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       VARIANT: userdebug
       B2G_DEBUG: 0

testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml

@@ -7,13 +7,13 @@ task:
   metadata:
     name: '[TC] B2G Flame KK OTA (user)'
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-user'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-user-objdir-gecko'
+    - 'docker-worker:cache:build-flame-kk-ota-user'
+    - 'docker-worker:cache:build-flame-kk-ota-user-objdir-gecko-{{project}}'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-flame-kk-ota-user: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-ota-user-objdir-gecko: /home/worker/objdir-gecko
+      build-flame-kk-ota-user: /home/worker/workspace
+      build-flame-kk-ota-user-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       VARIANT: user
       MOZHARNESS_CONFIG: b2g/taskcluster-phone-fota.py

testing/taskcluster/tasks/builds/b2g_flame_kk_spark_eng.yml

@@ -5,15 +5,15 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-spark-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-spark-eng-objdir-gecko'
+    - 'docker-worker:cache:build-flame-kk-spark-eng'
+    - 'docker-worker:cache:build-flame-kk-spark-eng-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Flame KK Eng (spark)'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-flame-kk-spark-eng: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-spark-eng-objdir-gecko: /home/worker/objdir-gecko
+      build-flame-kk-spark-eng: /home/worker/workspace
+      build-flame-kk-spark-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'flame-kk'
       MOZHARNESS_CONFIG: b2g/taskcluster-spark.py

testing/taskcluster/tasks/builds/b2g_hamachi_eng.yml

@@ -5,12 +5,12 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-hamachi-eng'
+    - 'docker-worker:cache:build-hamachi-eng'
   metadata:
     name: B2G Hamachi Eng
   payload:
     cache:
-      level-{{level}}-{{project}}-build-hamachi-eng: /home/worker/object-folder
+      build-hamachi-eng: /home/worker/object-folder
     env:
       TARGET: 'hamachi'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_hamachi_user.yml

@@ -5,12 +5,12 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-hamachi-user'
+    - 'docker-worker:cache:build-hamachi-user'
   metadata:
     name: B2G Hamachi User
   payload:
     cache:
-      level-{{level}}-{{project}}-build-hamachi-user: /home/worker/object-folder
+      build-hamachi-user: /home/worker/object-folder
     env:
       TARGET: 'hamachi'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_helix_user.yml

@@ -5,12 +5,12 @@ $inherits:
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-helix-user'
+    - 'docker-worker:cache:build-helix-user'
   metadata:
     name: B2G Helix User
   payload:
     cache:
-      level-{{level}}-{{project}}-build-helix-user: /home/worker/object-folder
+      build-hamachi-user: /home/worker/object-folder
     env:
       TARGET: 'helix'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_nexus_4_eng.yml

@@ -6,14 +6,14 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-eng-objdir-gecko'
+    - 'docker-worker:cache:build-nexus-4-eng'
+    - 'docker-worker:cache:build-nexus-4-eng-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Nexus 4 Eng'
   payload:
     cache:
-      level-{{level}}-{{project}}-build-nexus-4-eng: /home/worker/object-folder
-      level-{{level}}-{{project}}-build-nexus-4-eng-objdir-gecko: /home/worker/objdir-gecko
+      build-nexus-4-eng: /home/worker/object-folder
+      build-nexus-4-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'nexus-4'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_nexus_4_kk_eng.yml

@@ -6,14 +6,14 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-eng-objdir-gecko'
+    - 'docker-worker:cache:build-nexus-4-kk-eng'
+    - 'docker-worker:cache:build-nexus-4-kk-eng-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Nexus 4 KK Eng'
   payload:
     cache:
-      level-{{level}}-{{project}}-build-nexus-4-kk-eng: /home/worker/workspace
-      level-{{level}}-{{project}}-build-nexus-4-kk-eng-objdir-gecko: /home/worker/objdir-gecko
+      build-nexus-4-kk-eng: /home/worker/workspace
+      build-nexus-4-kk-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'nexus-4-kk'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_nexus_4_kk_ota_debug.yml

@@ -8,16 +8,16 @@ task:
   metadata:
     name: '[TC] B2G Nexus 4 KK OTA (userdebug)'
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug-objdir-gecko'
+    - 'docker-worker:cache:build-nexus-4-kk-ota-debug'
+    - 'docker-worker:cache:build-nexus-4-kk-ota-debug-objdir-gecko-{{project}}'
     - 'docker-worker:feature:balrogVPNProxy'
 
   payload:
     features:
       balrogVPNProxy: true
     cache:
-      level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug-objdir-gecko: /home/worker/objdir-gecko
+      build-nexus-4-kk-ota-debug: /home/worker/workspace
+      build-nexus-4-kk-ota-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       VARIANT: userdebug
       B2G_DEBUG: 0

testing/taskcluster/tasks/builds/b2g_nexus_4_kk_user.yml

@@ -6,14 +6,14 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-user'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-user-objdir-gecko'
+    - 'docker-worker:cache:build-nexus-4-kk-user'
+    - 'docker-worker:cache:build-nexus-4-kk-user-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Nexus 4 KK User'
   payload:
     cache:
-      level-{{level}}-{{project}}-build-nexus-4-kk-user: /home/worker/workspace
-      level-{{level}}-{{project}}-build-nexus-4-kk-user-objdir-gecko: /home/worker/objdir-gecko
+      build-nexus-4-kk-user: /home/worker/workspace
+      build-nexus-4-kk-user-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'nexus-4-kk'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_nexus_4_user.yml

@@ -6,15 +6,15 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-user'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-user-objdir-gecko'
+    - 'docker-worker:cache:build-nexus-4-user'
+    - 'docker-worker:cache:build-nexus-4-user-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Nexus 4 User'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-nexus-4-user: /home/worker/object-folder
-      level-{{level}}-{{project}}-build-nexus-4-user-objdir-gecko: /home/worker/objdir-gecko
+      build-nexus-4-user: /home/worker/object-folder
+      build-nexus-4-user-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'nexus-4'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_nexus_5l_eng.yml

@@ -6,14 +6,14 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-eng-objdir-gecko'
+    - 'docker-worker:cache:build-nexus-5-l-eng'
+    - 'docker-worker:cache:build-nexus-5-l-eng-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Nexus 5-L Eng'
   payload:
     cache:
-      level-{{level}}-{{project}}-build-nexus-5-l-eng: /home/worker/object-folder
-      level-{{level}}-{{project}}-build-nexus-5-l-eng-objdir-gecko: /home/worker/objdir-gecko
+      build-nexus-5-l-eng: /home/worker/object-folder
+      build-nexus-5-l-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'nexus-5-l'
       DEBUG: 0

testing/taskcluster/tasks/builds/b2g_nexus_5l_ota_debug.yml

@@ -8,16 +8,16 @@ task:
   metadata:
     name: '[TC] B2G Nexus 5L OTA (userdebug)'
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-ota-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-ota-debug-objdir-gecko'
+    - 'docker-worker:cache:build-nexus-5l-ota-debug'
+    - 'docker-worker:cache:build-nexus-5l-ota-debug-objdir-gecko-{{project}}'
     - 'docker-worker:feature:balrogVPNProxy'
 
   payload:
     features:
       balrogVPNProxy: true
     cache:
-      level-{{level}}-{{project}}-build-nexus-5l-ota-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-nexus-5l-ota-debug-objdir-gecko: /home/worker/objdir-gecko
+      build-nexus-5l-ota-debug: /home/worker/workspace
+      build-nexus-5l-ota-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       VARIANT: userdebug
       B2G_DEBUG: 0

testing/taskcluster/tasks/builds/b2g_nexus_5l_user.yml

@@ -6,15 +6,15 @@ $inherits:
 task:
   workerType: flame-kk
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-user'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-user-objdir-gecko'
+    - 'docker-worker:cache:build-nexus-5-l-user'
+    - 'docker-worker:cache:build-nexus-5-l-user-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Nexus 5-L User'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-nexus-5-l-user: /home/worker/object-folder
-      level-{{level}}-{{project}}-build-nexus-5-l-user-objdir-gecko: /home/worker/objdir-gecko
+      build-nexus-5-l-user: /home/worker/object-folder
+      build-nexus-5-l-user-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'nexus-5-l'
       DEBUG: 0

testing/taskcluster/tasks/builds/dbg_linux32.yml

@@ -3,8 +3,8 @@ $inherits:
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}}-build-linux32-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux32-c6-workspace'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-linux32-workspace: '/home/worker/workspace'
+      build-{{project}}-linux32-c6-workspace: '/home/worker/workspace'

testing/taskcluster/tasks/builds/dbg_linux64.yml

@@ -3,8 +3,8 @@ $inherits:
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux64-c6-workspace'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-linux64-workspace: '/home/worker/workspace'
+      build-{{project}}-linux64-c6-workspace: '/home/worker/workspace'

testing/taskcluster/tasks/builds/mulet_linux.yml

@@ -15,13 +15,13 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-mulet'
 
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-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:
-      level-{{level}}-{{project}}-build-mulet-linux-workspace: '/home/worker/workspace'
+      build-mulet-linux-{{project}}-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tools/tooltool-cache'
 
     features:

testing/taskcluster/tasks/builds/opt_linux32.yml

@@ -3,8 +3,8 @@ $inherits:
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux32-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux32-c6-workspace'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-linux32-workspace: '/home/worker/workspace'
+      build-{{project}}-linux32-c6-workspace: '/home/worker/workspace'

testing/taskcluster/tasks/builds/opt_linux64.yml

@@ -3,8 +3,8 @@ $inherits:
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux64-c6-workspace'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-linux64-workspace: '/home/worker/workspace'
+      build-{{project}}-linux64-c6-workspace: '/home/worker/workspace'

testing/taskcluster/tasks/builds/opt_linux64_st-an.yml

@@ -10,7 +10,7 @@ task:
       description: 'Linux64 Static Analysis Opt'
 
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-st-an-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux64-st-an-workspace'
 
   routes:
     - 'index.buildbot.branches.{{project}}.linux64-st-an'
@@ -20,7 +20,7 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-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'

testing/taskcluster/tasks/builds/opt_macosx64.yml

@@ -3,7 +3,7 @@ $inherits:
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-macosx64-workspace'
+    - 'docker-worker:cache:build-macosx64-workspace'
 
   routes:
     - 'index.buildbot.branches.{{project}}.macosx64'
@@ -11,4 +11,4 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-macosx64-workspace: '/home/worker/workspace'
+      build-macosx64-workspace: '/home/worker/workspace'

testing/taskcluster/tasks/builds/opt_macosx64_st-an.yml

@@ -8,7 +8,7 @@ task:
       description: 'MacOSX64 Static Analysis Opt'
 
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-macosx64-st-an-workspace'
+    - 'docker-worker:cache:build-macosx64-st-an-workspace'
 
   routes:
     - 'index.buildbot.branches.{{project}}.macosx64-st-an'
@@ -16,7 +16,7 @@ task:
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-macosx64-st-an-workspace: '/home/worker/workspace'
+      build-macosx64-st-an-workspace: '/home/worker/workspace'
     env:
       MH_CUSTOM_BUILD_VARIANT_CFG: 'cross-opt'
       DIST_UPLOADS: ''

testing/taskcluster/tasks/builds/sm_base.yml

@@ -8,12 +8,12 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.sm-plain'
 
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-spidermonkey-workspace'
+    - 'docker-worker:cache:build-spidermonkey-workspace'
 
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
-      level-{{level}}-{{project}}-build-spidermonkey-workspace: '/home/worker/workspace'
+      build-spidermonkey-c6-workspace: '/home/worker/workspace'
 
     env:
       GECKO_REPOSITORY: '{{base_repository}}'

testing/taskcluster/tasks/decision/branch.yml

@@ -36,7 +36,7 @@ tasks:
       provisionerId: "aws-provisioner-v1"
 
       scopes:
-        - "docker-worker:cache:level-{{level}}-{{project}}-tc-vcs-public-sources"
+        - "docker-worker:cache:tc-vcs-public-sources"
 
       payload:
         env:
@@ -49,7 +49,7 @@ tasks:
           # The taskcluster-vcs tooling stores the large clone caches in this
           # directory and will reuse them for new requests this saves about 20s~ and
           # is the most generic cache possible.
-          level-{{level}}-{{project}}-tc-vcs-public-sources: '/home/worker/.tc-vcs/'
+          tc-vcs-public-sources: '/home/worker/.tc-vcs/'
 
         # Note: This task is built server side without the context or tooling that
         # exist in tree so we must hard code the version
@@ -72,7 +72,6 @@ tasks:
             --message='{{comment}}'
             --project='{{project}}'
             --owner='{{owner}}'
-            --level='{{level}}'
             --revision-hash='{{revision_hash}}'
             --extend-graph > /home/worker/artifacts/graph.json
         graphs:

testing/taskcluster/tasks/decision/periodic_alder.yml

@@ -13,14 +13,14 @@ task:
   provisionerId: aws-provisioner-v1
 
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs-public-sources'
+    - 'docker-worker:cache:tc-vcs-public-sources'
 
   payload:
     cache:
       # The taskcluster-vcs tooling stores the large clone caches in this
       # directory and will reuse them for new requests this saves about 20s~ and
       # is the most generic cache possible.
-      level-{{level}}-{{project}}-tc-vcs-public-sources: '/home/worker/.tc-vcs/'
+      tc-vcs-public-sources: '/home/worker/.tc-vcs/'
 
     # Note: This task is built server side without the context or tooling that
     # exist in tree so we must hard code the version

testing/taskcluster/tasks/decision/try.yml

@@ -34,8 +34,8 @@ tasks:
         createdForUser: {{owner}}
 
       scopes:
-        - "docker-worker:cache:level-{{level}}-{{project}}-tc-vcs-public-sources"
-        - "docker-worker:cache:level-{{level}}-{{project}}-gecko-decision"
+        - "docker-worker:cache:tc-vcs-public-sources"
+        - "docker-worker:cache:gecko-decision"
         - "queue:route:tc-treeherder-stage.{{project}}.{{revision_hash}}"
         - "queue:route:tc-treeherder.{{project}}.{{revision_hash}}"
 
@@ -54,8 +54,8 @@ tasks:
           # The taskcluster-vcs tooling stores the large clone caches in this
           # directory and will reuse them for new requests this saves about 20s~ and
           # is the most generic cache possible.
-          level-{{level}}-{{project}}-tc-vcs-public-sources: /home/worker/.tc-vcs/
-          level-{{level}}-{{project}}-gecko-decision: /home/worker/workspace
+          tc-vcs-public-sources: /home/worker/.tc-vcs/
+          gecko-decision: /home/worker/workspace
 
         # Note: This task is built server side without the context or tooling that
         # exist in tree so we must hard code the version
@@ -79,7 +79,6 @@ tasks:
             --project='{{project}}'
             --message='{{comment}}'
             --owner='{{owner}}'
-            --level='{{level}}'
             --revision-hash='{{revision_hash}}'
             --extend-graph > /home/worker/artifacts/graph.json
 

testing/taskcluster/tasks/lint.yml

@@ -23,14 +23,14 @@ task:
   scopes:
     # Nearly all of our build tasks use tc-vcs so just include the scope across
     # the board.
-    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
+    - 'docker-worker:cache:tc-vcs'
 
   payload:
     # Thirty minutes should be enough for lint checks
     maxRunTime: 1800
 
     cache:
-      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
+      tc-vcs: '/home/worker/.tc-vcs'
 
   extra:
     build_product: '{{build_product}}'

testing/taskcluster/tasks/phone_build.yml

@@ -24,7 +24,7 @@ task:
   scopes:
     # Nearly all of our build tasks use tc-vcs so just include the scope across
     # the board.
-    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
+    - 'docker-worker:cache:tc-vcs'
     - 'docker-worker:image:{{#docker_image}}phone-builder{{/docker_image}}'
 
   payload:
@@ -34,7 +34,7 @@ task:
     maxRunTime: 3600
 
     cache:
-      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
+      tc-vcs: '/home/worker/.tc-vcs'
 
     # All builds share a common artifact directory for ease of uploading.
     artifacts:

testing/taskcluster/tasks/phone_test.yml

@@ -13,14 +13,14 @@ task:
   scopes:
     - 'docker-worker:image:{{#docker_image}}tester-device{{/docker_image}}'
     - 'queue:create-task:aws-provisioner-v1/testdroid-device'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
+    - 'docker-worker:cache:tc-vcs'
     - 'docker-worker:capability:device:phone'
 
   payload:
     image: '{{#docker_image}}tester-device{{/docker_image}}'
     maxRunTime: 7200
     cache:
-      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
+      tc-vcs: '/home/worker/.tc-vcs'
     env:
       MOZ_BUILD_DATE: '{{pushdate}}'
       GAIA_HEAD_REPOSITORY: '{{{gaia_head_repository}}}'

testing/taskcluster/tasks/post-builds/mulet_simulator.yml

@@ -21,7 +21,7 @@ task:
     - 'index.gecko.v1.{{project}}.latest.simulator.{{build_type}}'
 
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
+    - 'docker-worker:cache:tc-vcs'
 
   payload:
     image:

testing/taskcluster/tasks/tests/b2g_unittest_base.yml

@@ -3,15 +3,15 @@ $inherits:
   from: 'tasks/test.yml'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-dotcache'
+    - 'docker-worker:cache:tc-vcs'
+    - 'docker-worker:cache:linux-cache'
     - 'docker-worker:capability:device:loopbackVideo'
     - 'docker-worker:capability:device:loopbackAudio'
   payload:
     cache:
       # So pip installs are cached...
-      level-{{level}}-{{project}}-dotcache: /home/worker/.cache
-      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
+      linux-cache: /home/worker/.cache
+      tc-vcs: '/home/worker/.tc-vcs'
     capabilities:
       devices:
         loopbackVideo: true

testing/taskcluster/tasks/tests/mulet_mochitests.yml

@@ -6,16 +6,16 @@ task:
     name: '[TC] Mulet Mochitests ( {{chunk}} )'
     description: Mulet Mochitest run {{chunk}}
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-dotcache'
+    - 'docker-worker:cache:tc-vcs'
+    - 'docker-worker:cache:linux-cache'
     - 'docker-worker:capability:device:loopbackVideo'
     - 'docker-worker:capability:device:loopbackAudio'
   payload:
     image: '{{#docker_image}}desktop-test{{/docker_image}}'
     cache:
       # So pip installs are cached...
-      level-{{level}}-{{project}}-dotcache: /home/worker/.cache
-      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
+      linux-cache: /home/worker/.cache
+      tc-vcs: '/home/worker/.tc-vcs'
     capabilities:
       devices:
         loopbackVideo: true