diff options
| -rw-r--r-- | .taskcluster.yml | 7 | ||||
| -rw-r--r-- | automation/taskcluster/graph/build.js | 14 |
2 files changed, 6 insertions, 15 deletions
diff --git a/.taskcluster.yml b/.taskcluster.yml index 814981076..0ee7c6ced 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -53,8 +53,8 @@ tasks: createdForUser: {{owner}} routes: - - "tc-treeherder-stage.v2.nss.{{head_rev}}.{{pushlog_id}}" - - "tc-treeherder.v2.nss.{{head_rev}}.{{pushlog_id}}" + - "tc-treeherder-stage.v2.nss.{{revision}}.{{pushlog_id}}" + - "tc-treeherder.v2.nss.{{revision}}.{{pushlog_id}}" payload: image: "ttaubert/nss-ci:0.0.16" @@ -62,8 +62,7 @@ tasks: env: TC_OWNER: {{owner}} TC_SOURCE: {{{source}}} - TC_HEAD_REV: '{{head_rev}}' - TC_PUSHLOG_ID: '{{pushlog_id}}' + NSS_PUSHLOG_ID: '{{pushlog_id}}' NSS_HEAD_REPOSITORY: '{{{url}}}' NSS_HEAD_REVISION: '{{revision}}' diff --git a/automation/taskcluster/graph/build.js b/automation/taskcluster/graph/build.js index ef185df7d..6afbde3ea 100644 --- a/automation/taskcluster/graph/build.js +++ b/automation/taskcluster/graph/build.js @@ -10,10 +10,9 @@ var slugid = require("slugid"); var flatmap = require("flatmap"); // Default values for debugging. -var TC_HEAD_REV = process.env.TC_HEAD_REV || "{{tc_head_rev}}"; -var TC_PUSHLOG_ID = process.env.TC_PUSHLOG_ID || "{{tc_pushlog_id}}"; var TC_OWNER = process.env.TC_OWNER || "{{tc_owner}}"; var TC_SOURCE = process.env.TC_SOURCE || "{{tc_source}}"; +var NSS_PUSHLOG_ID = process.env.NSS_PUSHLOG_ID || "{{nss_pushlog_id}}"; var NSS_HEAD_REPOSITORY = process.env.NSS_HEAD_REPOSITORY || "{{nss_head_repo}}"; var NSS_HEAD_REVISION = process.env.NSS_HEAD_REVISION || "{{nss_head_rev}}"; @@ -65,17 +64,10 @@ function decorateTask(task) { // Assign random task id. task.taskId = slugid.v4(); - // Permissions. - task.task.scopes = [ - "queue:route:tc-treeherder-stage.v2.nss." + TC_HEAD_REV + "." + TC_PUSHLOG_ID, - "queue:route:tc-treeherder.v2.nss." + TC_HEAD_REV + "." + TC_PUSHLOG_ID, - "scheduler:extend-task-graph:*" - ]; - // TreeHerder routes. task.task.routes = [ - "tc-treeherder-stage.v2.nss." + TC_HEAD_REV + "." + TC_PUSHLOG_ID, - "tc-treeherder.v2.nss." + TC_HEAD_REV + "." + TC_PUSHLOG_ID + "tc-treeherder-stage.v2.nss." + NSS_HEAD_REVISION + "." + NSS_PUSHLOG_ID, + "tc-treeherder.v2.nss." + NSS_HEAD_REVISION + "." + NSS_PUSHLOG_ID ]; } |