3 files changed, 26 insertions, 17 deletions
diff --git a/.taskcluster.yml b/.taskcluster.yml
index e4d410aed..92b662fa3 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -103,3 +103,5 @@ tasks:
           symbol: D
           revision: '{{revision}}'
           revision_hash: '{{revision_hash}}'
+          build:
+            platform: nss-decision
diff --git a/automation/taskcluster/graph/build.js b/automation/taskcluster/graph/build.js
index 00fc92c2a..8e147c0f0 100644
--- a/automation/taskcluster/graph/build.js
+++ b/automation/taskcluster/graph/build.js
@@ -84,7 +84,6 @@ function build_task(id, def) {
   task.payload.command = def.command;
   task.payload.env = def.env || {};
   task.extra.treeherder = merge.recursive(true, task.extra.treeherder, def.treeherder || {});
-  task.extra.build_type = def.build_type || "opt";
 
   // Forward some GitHub env variables.
   task.payload.env.NSS_HEAD_REPOSITORY = process.env.NSS_HEAD_REPOSITORY;
diff --git a/automation/taskcluster/graph/graph.yml b/automation/taskcluster/graph/graph.yml
index 448825603..b6b2675ae 100644
--- a/automation/taskcluster/graph/graph.yml
+++ b/automation/taskcluster/graph/graph.yml
@@ -185,18 +185,15 @@ templates:
       NSS_TESTS: "tools"
 
 graph:
-  build-32-debug-asan:
-    name: "Linux 32 (debug, ASan)"
+  build-32-debug:
+    name: "Linux 32 (debug)"
     extends: builder
-    env:
-      USE_ASAN: 1
     treeherder:
       symbol: B
       build:
         platform: linux32
-      machine:
-        platform: linux32
-    build_type: dbg
+      collection:
+        debug: true
 
   build-32-opt:
     name: "Linux 32 (opt)"
@@ -207,22 +204,33 @@ graph:
       symbol: B
       build:
         platform: linux32
-      machine:
-        platform: linux32
+      collection:
+        opt: true
 
-  build-64-debug-asan:
-    name: "Linux 64 (debug, ASan)"
+  build-64-debug:
+    name: "Linux 64 (debug)"
     extends: builder
     env:
-      USE_ASAN: 1
       USE_64: 1
     treeherder:
       symbol: B
       build:
         platform: linux64
-      machine:
+      collection:
+        debug: true
+
+  build-64-asan:
+    name: "Linux 64 (ASan)"
+    extends: builder
+    env:
+      USE_ASAN: 1
+      USE_64: 1
+    treeherder:
+      symbol: B
+      build:
         platform: linux64
-    build_type: dbg
+      collection:
+        asan: true
 
   build-64-opt:
     name: "Linux 64 (opt)"
@@ -234,8 +242,8 @@ graph:
       symbol: B
       build:
         platform: linux64
-      machine:
-        platform: linux64
+      collection:
+        opt: true
 
 # build-32-debug-asan-gcc6:
 #   name: "Linux 32 (gcc6, debug, ASan)"