From be9ec739483b4dcbbaf22086d3775f01a9e2be6d Mon Sep 17 00:00:00 2001
From: Anthony Miyaguchi <amiyaguchi@mozilla.com>
Date: Tue, 7 Jul 2015 17:45:36 -0700
Subject: [PATCH] Bug 1168979 part 3 - Clean up upload_symbol template.
 r=mrrrgn

---
 testing/taskcluster/mach_commands.py         |  5 +++--
 testing/taskcluster/tasks/upload_symbols.yml | 16 ++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/testing/taskcluster/mach_commands.py b/testing/taskcluster/mach_commands.py
index 4355d71169e1..1538b23cfd59 100644
--- a/testing/taskcluster/mach_commands.py
+++ b/testing/taskcluster/mach_commands.py
@@ -332,10 +332,11 @@ class Graph(object):
                 raise ValueError(message.fomrat(build['task']))
 
             if 'post-build' in build:
+                # copy over the old parameters to update the template
                 post_parameters = copy.copy(build_parameters)
-                post_parameters['artifact_taskid'] = build_parameters['build_slugid']
+                post_parameters['taskId'] = slugid()
+
                 post_task = templates.load(build['post-build']['task'], post_parameters)
-                post_task['taskId'] = slugid()
 
                 if 'requires' not in post_task:
                     post_task['requires'] = []
diff --git a/testing/taskcluster/tasks/upload_symbols.yml b/testing/taskcluster/tasks/upload_symbols.yml
index dec55340b1e9..bedfefb48e86 100644
--- a/testing/taskcluster/tasks/upload_symbols.yml
+++ b/testing/taskcluster/tasks/upload_symbols.yml
@@ -1,20 +1,19 @@
 # This is a sample task for uploading debug symbols to the socorro api
 ---
-taskId: {{build_slugid}}
+taskId: {{taskId}}
 
 task:
   created: '{{now}}'
   deadline: '{{#from_now}}24 hours{{/from_now}}'
   metadata:
     source: http://todo.com/soon
-    owner: mozilla-taskcluster-maintenance@mozilla.com
+    owner: amiyaguchi@mozilla.com
     name: '[TC] Upload Symbols'
     description: 'Upload Symbols'
-
   tags:
     createdForUser: {{owner}}
 
-  workerType: b2gbuild
+  workerType: b2gtest
   provisionerId: aws-provisioner-v1
   schedulerId: task-graph-scheduler
 
@@ -34,12 +33,13 @@ task:
     command: ["/bin/bash", "bin/upload.sh"]
 
     env:
-      ARTIFACT_TASKID: '{{artifact_taskid}}'
+      ARTIFACT_TASKID: '{{build_slugid}}'
 
   extra:
-    index:
-      rank: {{pushlog_id}}
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
       groupSymbol: tc
       groupName: Submitted by taskcluster
-      symbol: B
+      symbol: us