Bug 1286075: use regular cache names for various builds; r=mshal
For the most part, this means including the full build_platform (which is not
always the same as build_name) and build_type in the cache name. This makes
the names consistent so they can be generated automatically rather than
specified explicitly.
MozReview-Commit-ID: 7VWm48F1Fzy
--- a/taskcluster/ci/legacy/tasks/builds/android_api_15.yml
+++ b/taskcluster/ci/legacy/tasks/builds/android_api_15.yml
@@ -10,24 +10,24 @@ task:
workerType: android-api-15
routes:
- 'index.buildbot.branches.{{project}}.android-api-15'
- 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-15'
scopes:
- - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-workspace'
+ - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-opt-workspace'
- 'docker-worker:cache:tooltool-cache'
- 'docker-worker:relengapi-proxy:tooltool.download.internal'
- 'docker-worker:relengapi-proxy:tooltool.download.public'
payload:
cache:
- level-{{level}}-{{project}}-build-android-api-15-workspace: '/home/worker/workspace'
+ level-{{level}}-{{project}}-build-android-api-15-opt-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/taskcluster/ci/legacy/tasks/builds/android_api_15_debug.yml
+++ b/taskcluster/ci/legacy/tasks/builds/android_api_15_debug.yml
@@ -10,24 +10,24 @@ task:
workerType: android-api-15
routes:
- 'index.buildbot.branches.{{project}}.android-api-15-debug'
- 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-15-debug'
scopes:
- - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-dbg-workspace'
+ - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-debug-workspace'
- 'docker-worker:cache:tooltool-cache'
- 'docker-worker:relengapi-proxy:tooltool.download.internal'
- 'docker-worker:relengapi-proxy:tooltool.download.public'
payload:
cache:
- level-{{level}}-{{project}}-build-android-api-15-dbg-workspace: '/home/worker/workspace'
+ level-{{level}}-{{project}}-build-android-api-15-debug-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/taskcluster/ci/legacy/tasks/builds/android_api_15_gradle.yml
+++ b/taskcluster/ci/legacy/tasks/builds/android_api_15_gradle.yml
@@ -10,24 +10,24 @@ task:
workerType: android-api-15
routes:
- 'index.buildbot.branches.{{project}}.android-api-15-gradle'
- 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-15-gradle'
scopes:
- - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-gradle-workspace'
+ - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-gradle-opt-workspace'
- 'docker-worker:cache:tooltool-cache'
- 'docker-worker:relengapi-proxy:tooltool.download.internal'
- 'docker-worker:relengapi-proxy:tooltool.download.public'
payload:
cache:
- level-{{level}}-{{project}}-build-android-api-15-gradle-workspace: '/home/worker/workspace'
+ level-{{level}}-{{project}}-build-android-api-15-gradle-opt-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/taskcluster/ci/legacy/tasks/builds/android_x86.yml
+++ b/taskcluster/ci/legacy/tasks/builds/android_x86.yml
@@ -10,24 +10,24 @@ task:
workerType: android-api-15
routes:
- 'index.buildbot.branches.{{project}}.android-x86'
- 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-x86'
scopes:
- - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-x86-workspace'
+ - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-x86-opt-workspace'
- 'docker-worker:cache:tooltool-cache'
- 'docker-worker:relengapi-proxy:tooltool.download.internal'
- 'docker-worker:relengapi-proxy:tooltool.download.public'
payload:
cache:
- level-{{level}}-{{project}}-build-android-x86-workspace: '/home/worker/workspace'
+ level-{{level}}-{{project}}-build-android-x86-opt-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/taskcluster/ci/legacy/tasks/builds/base_macosx64.yml
+++ b/taskcluster/ci/legacy/tasks/builds/base_macosx64.yml
@@ -1,26 +1,26 @@
$inherits:
from: 'tasks/builds/firefox_docker_base.yml'
task:
scopes:
- 'docker-worker:cache:tooltool-cache'
- - 'docker-worker:cache:level-{{level}}-{{project}}-build-{{build_name}}-workspace'
+ - 'docker-worker:cache:level-{{level}}-{{project}}-build-{{build_name}}-{{build_type}}-workspace'
- 'docker-worker:relengapi-proxy:tooltool.download.internal'
- 'docker-worker:relengapi-proxy:tooltool.download.public'
routes:
- 'index.buildbot.branches.{{project}}.{{build_name}}'
- 'index.buildbot.revisions.{{head_rev}}.{{project}}.{{build_name}}'
payload:
cache:
tooltool-cache: '/home/worker/tooltool-cache'
- level-{{level}}-{{project}}-build-{{build_name}}-workspace: '/home/worker/workspace'
+ level-{{level}}-{{project}}-build-{{build_name}}-{{build_type}}-workspace: '/home/worker/workspace'
features:
relengAPIProxy: true
env:
MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
MOZHARNESS_CONFIG: 'builds/releng_base_mac_64_cross_builds.py balrog/production.py'
MOZHARNESS_ACTIONS: 'get-secrets build generate-build-stats update'
--- a/taskcluster/ci/legacy/tasks/builds/haz_linux.yml
+++ b/taskcluster/ci/legacy/tasks/builds/haz_linux.yml
@@ -8,21 +8,21 @@ task:
name: '[TC] Browser Hazard Linux'
description: Browser Hazard Analysis Linux
workerType: 'gecko-{{level}}-b-linux'
scopes:
- 'docker-worker:cache:tooltool-cache'
- 'docker-worker:relengapi-proxy:tooltool.download.public'
- - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-haz-workspace'
+ - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-haz-debug-workspace'
payload:
cache:
- level-{{level}}-{{project}}-build-linux64-haz-workspace: '/home/worker/workspace'
+ level-{{level}}-{{project}}-build-linux64-haz-debug-workspace: '/home/worker/workspace'
tooltool-cache: '/home/worker/tooltool-cache'
features:
relengAPIProxy: true
env:
MOZCONFIG: 'browser/config/mozconfigs/linux64/hazards'
TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
--- a/taskcluster/ci/legacy/tasks/builds/haz_shell_linux.yml
+++ b/taskcluster/ci/legacy/tasks/builds/haz_shell_linux.yml
@@ -8,21 +8,21 @@ task:
name: '[TC] JS Shell Hazard Linux'
description: JS Shell Hazard Analysis Linux
workerType: 'gecko-{{level}}-b-linux'
scopes:
- 'docker-worker:cache:tooltool-cache'
- 'docker-worker:relengapi-proxy:tooltool.download.public'
- - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-haz-workspace'
+ - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-shell-haz-debug-workspace'
payload:
cache:
- level-{{level}}-{{project}}-build-linux64-haz-workspace: '/home/worker/workspace'
+ level-{{level}}-{{project}}-build-linux64-shell-haz-debug-workspace: '/home/worker/workspace'
tooltool-cache: '/home/worker/tooltool-cache'
features:
relengAPIProxy: true
env:
TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
TOOLTOOL_MANIFEST: 'browser/config/tooltool-manifests/linux64/hazard.manifest'
--- a/taskcluster/ci/legacy/tasks/builds/mulet_linux.yml
+++ b/taskcluster/ci/legacy/tasks/builds/mulet_linux.yml
@@ -10,23 +10,23 @@ task:
workerType: mulet-opt
routes:
- 'index.buildbot.branches.{{project}}.linux64-mulet'
- 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-mulet'
scopes:
- - 'docker-worker:cache:level-{{level}}-{{project}}-build-mulet-linux-workspace'
+ - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-mulet-opt-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'
+ level-{{level}}-{{project}}-build-linux64-mulet-opt-workspace: '/home/worker/workspace'
tooltool-cache: '/home/worker/tools/tooltool-cache'
features:
relengAPIProxy: true
env:
MOZCONFIG: 'b2g/dev/config/mozconfigs/linux64/mulet'
TOOLTOOL_MANIFEST: 'b2g/dev/config/tooltool-manifests/linux64/releng.manifest'
--- a/taskcluster/ci/legacy/tasks/builds/mulet_linux_dbg.yml
+++ b/taskcluster/ci/legacy/tasks/builds/mulet_linux_dbg.yml
@@ -10,23 +10,23 @@ task:
workerType: mulet-debug
routes:
- 'index.buildbot.branches.{{project}}.linux64-mulet'
- 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-mulet'
scopes:
- - 'docker-worker:cache:level-{{level}}-{{project}}-build-mulet-dbg-linux-workspace'
+ - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-mulet-debug-workspace'
- 'docker-worker:cache:tooltool-cache'
- 'docker-worker:relengapi-proxy:tooltool.download.public'
payload:
cache:
- level-{{level}}-{{project}}-build-mulet-dbg-linux-workspace: '/home/worker/workspace'
+ level-{{level}}-{{project}}-build-linux64-mulet-debug-workspace: '/home/worker/workspace'
tooltool-cache: '/home/worker/tools/tooltool-cache'
features:
relengAPIProxy: true
env:
MOZCONFIG: 'b2g/dev/config/mozconfigs/linux64/mulet_dbg'
TOOLTOOL_MANIFEST: 'b2g/dev/config/tooltool-manifests/linux64/releng.manifest'