Bug 1324094 - Add correct cache scopes to action tasks r=armenzg,dustin
authorBrian Stack <bstack@mozilla.com>
Fri, 16 Dec 2016 13:06:57 -0800
changeset 326892 02cbb6db8bd22dbfde0e79e6b0320fbe97a24518
parent 326891 294ce2352aa7574de1353a6f75ccc0a664752589
child 326893 8cfe0d2b6a60c8609476bde27059842542ee30a5
push id31114
push usercbook@mozilla.com
push dateThu, 22 Dec 2016 15:19:05 +0000
treeherdermozilla-central@8460203bc93b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarmenzg, dustin
bugs1324094
milestone53.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 1324094 - Add correct cache scopes to action tasks r=armenzg,dustin MozReview-Commit-ID: KxtG4cHU0Mm
taskcluster/taskgraph/action.yml
taskcluster/taskgraph/decision.py
--- a/taskcluster/taskgraph/action.yml
+++ b/taskcluster/taskgraph/action.yml
@@ -12,20 +12,19 @@ workerType: "gecko-decision"
 provisionerId: "aws-provisioner-v1"
 schedulerId: "gecko-level-{{level}}"
 
 tags:
   createdForUser: {{owner}}
 
 scopes:
   # Bug 1269443: cache scopes, etc. must be listed explicitly
-  - "docker-worker:cache:level-1-*"
   - "docker-worker:cache:tooltool-cache"
   - "secrets:get:project/taskcluster/gecko/hgfingerprint"
-  - "assume:repo:hg.mozilla.org/try:*"
+  - "assume:repo:hg.mozilla.org/{{project}}:*"
 
 routes:
   - "tc-treeherder.v2.{{project}}.{{head_rev}}.{{pushlog_id}}"
   - "tc-treeherder-stage.v2.{{project}}.{{head_rev}}.{{pushlog_id}}"
 
 payload:
   env:
     GECKO_BASE_REPOSITORY: 'https://hg.mozilla.org/mozilla-unified'
--- a/taskcluster/taskgraph/decision.py
+++ b/taskcluster/taskgraph/decision.py
@@ -176,12 +176,13 @@ def write_artifact(filename, data):
 
 
 def get_action_yml(parameters):
     templates = Templates(os.path.join(GECKO, "taskcluster/taskgraph"))
     action_parameters = parameters.copy()
     action_parameters.update({
         "action": "{{action}}",
         "action_args": "{{action_args}}",
+        "project": parameters["project"],
         "from_now": json_time_from_now,
         "now": current_json_time()
     })
     return templates.load('action.yml', action_parameters)