Bug 1274350 - Use Taskcluster v2 routes r=me

5 files changed, 10 insertions, 23 deletions

diff --git a/.taskcluster.yml b/.taskcluster.yml
index b53fede53..814981076 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -52,16 +52,9 @@ tasks:
       tags:
         createdForUser: {{owner}}
 
-      scopes:
-        - "queue:route:tc-treeherder-stage.nss.{{revision_hash}}"
-        - "queue:route:tc-treeherder.nss.{{revision_hash}}"
-        - "scheduler:extend-task-graph:*"
-        # mozilla-taskcluster will append the appropriate assume:repo:<repo>
-        # scope here.
-
       routes:
-        - "tc-treeherder-stage.nss.{{revision_hash}}"
-        - "tc-treeherder.nss.{{revision_hash}}"
+        - "tc-treeherder-stage.v2.nss.{{head_rev}}.{{pushlog_id}}"
+        - "tc-treeherder.v2.nss.{{head_rev}}.{{pushlog_id}}"
 
       payload:
         image: "ttaubert/nss-ci:0.0.16"
@@ -69,8 +62,8 @@ tasks:
         env:
           TC_OWNER: {{owner}}
           TC_SOURCE: {{{source}}}
-          TC_REVISION: '{{revision}}'
-          TC_REVISION_HASH: '{{revision_hash}}'
+          TC_HEAD_REV: '{{head_rev}}'
+          TC_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 8631383f3..ef185df7d 100644
--- a/automation/taskcluster/graph/build.js
+++ b/automation/taskcluster/graph/build.js
@@ -10,8 +10,8 @@ var slugid = require("slugid");
 var flatmap = require("flatmap");
 
 // Default values for debugging.
-var TC_REVISION = process.env.TC_REVISION || "{{tc_rev}}";
-var TC_REVISION_HASH = process.env.TC_REVISION_HASH || "{{tc_rev_hash}}";
+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_HEAD_REPOSITORY = process.env.NSS_HEAD_REPOSITORY || "{{nss_head_repo}}";
@@ -67,15 +67,15 @@ function decorateTask(task) {
 
   // Permissions.
   task.task.scopes = [
-    "queue:route:tc-treeherder-stage.nss." + TC_REVISION_HASH,
-    "queue:route:tc-treeherder.nss." + TC_REVISION_HASH,
+    "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.nss." + TC_REVISION_HASH,
-    "tc-treeherder.nss." + TC_REVISION_HASH
+    "tc-treeherder-stage.v2.nss." + TC_HEAD_REV + "." + TC_PUSHLOG_ID,
+    "tc-treeherder.v2.nss." + TC_HEAD_REV + "." + TC_PUSHLOG_ID
   ];
 }
 
diff --git a/automation/taskcluster/graph/linux/_build_base.yml b/automation/taskcluster/graph/linux/_build_base.yml
index 2af1b0ee7..b73d14a9f 100644
--- a/automation/taskcluster/graph/linux/_build_base.yml
+++ b/automation/taskcluster/graph/linux/_build_base.yml
@@ -35,6 +35,4 @@ task:
 
   extra:
     treeherder:
-      revision: !env TC_REVISION
-      revision_hash: !env TC_REVISION_HASH
       symbol: B
diff --git a/automation/taskcluster/graph/tools/clang-format.yml b/automation/taskcluster/graph/tools/clang-format.yml
index d55471a1e..1445e9793 100644
--- a/automation/taskcluster/graph/tools/clang-format.yml
+++ b/automation/taskcluster/graph/tools/clang-format.yml
@@ -33,5 +33,3 @@
         machine:
           platform: nss-tools
         symbol: clang-format-3.8
-        revision: !env TC_REVISION
-        revision_hash: !env TC_REVISION_HASH
diff --git a/automation/taskcluster/graph/windows/_build_base.yml b/automation/taskcluster/graph/windows/_build_base.yml
index 80e55a60a..da99b5810 100644
--- a/automation/taskcluster/graph/windows/_build_base.yml
+++ b/automation/taskcluster/graph/windows/_build_base.yml
@@ -33,6 +33,4 @@ task:
 
   extra:
     treeherder:
-      revision: !env TC_REVISION
-      revision_hash: !env TC_REVISION_HASH
       symbol: B