Bug 1122774 - Add treeherder integration r=garndt

--HG-- extra : rebase_source : 6913aaaa524955ecb43a89ef38475b3c71889518 extra : source : 114f6270378ab956c0bf6bc36fb7a2c6f0736750 extra : histedit_source : d3eb9257eb1f0afc2bd4d47f3c4e40cba36fea31
2015-01-21 01:53:37 -08:00 · 2015-01-21 01:53:37 -08:00 · 424ac9045f
--- a/testing/taskcluster/mach_commands.py
+++ b/testing/taskcluster/mach_commands.py
@ -36,6 +36,8 @@ REGISTRY = open(os.path.join(DOCKER_ROOT, 'REGISTRY')).read().strip()

 DEFINE_TASK = 'queue:define-task:aws-provisioner/{}'

+TREEHERDER_ROUTE_PREFIX = 'tc-treeherder-stage'
+
 DEFAULT_TRY = 'try: -b do -p all -u all'
 DEFAULT_JOB_PATH = os.path.join(
    ROOT, 'tasks', 'branches', 'mozilla-central', 'job_flags.yml'
@ -97,7 +99,7 @@ class DecisionTask(object):
    @CommandArgument('--project',
        required=True,
        help='Treeherder project name')
-    @CommandArgument('--repository',
+    @CommandArgument('--url',
        required=True,
        help='Gecko repository to use as head repository.')
    @CommandArgument('--revision',
@ -117,7 +119,7 @@ class DecisionTask(object):
            'source': 'http://todo.com/soon',
            'project': params['project'],
            'comment': params['comment'],
-            'repository_url': params['repository'],
+            'url': params['url'],
            'revision': params['revision'],
            'owner': params['owner'],
            'as_slugid': SlugidJar(),
@ -151,6 +153,9 @@ class Graph(object):
        help='Commit revision to use from mozharness repository')
    @CommandArgument('--message',
        help='Commit message to be parsed. Example: "try: -b do -p all -u all"')
+    @CommandArgument('--revision-hash',
+            required=False,
+            help='Treeherder revision hash to attach results to')
    @CommandArgument('--project',
        required=True,
        help='Project to use for creating task graph. Example: --project=try')
@ -190,15 +195,25 @@ class Graph(object):
            'from_now': json_time_from_now,
            'now': datetime.datetime.now().isoformat(),
            'mozharness_repository': params['mozharness_repository'],
-            'mozharness_rev': params['mozharness_rev']
+            'mozharness_rev': params['mozharness_rev'],
+            'revision_hash': params['revision_hash']
        }

+        treeherder_route = '{}.{}.{}'.format(
+            TREEHERDER_ROUTE_PREFIX,
+            params['project'],
+            params.get('revision_hash', '')
+        )
+
        # Task graph we are generating for taskcluster...
        graph = {
            'tasks': [],
            'scopes': []
        }

+        if params['revision_hash']:
+            graph['scopes'].append('queue:route:{}'.format(treeherder_route))
+
        graph['metadata'] = {
            'source': 'http://todo.com/what/goes/here',
            'owner': params['owner'],
@ -212,6 +227,12 @@ class Graph(object):
            build_parameters['build_slugid'] = slugid()
            build_task = templates.load(build['task'], build_parameters)

+            if 'routes' not in build_task['task']:
+                build_task['task']['routes'] = [];
+
+            if params['revision_hash']:
+                build_task['task']['routes'].append(treeherder_route)
+
            # Ensure each build graph is valid after construction.
            taskcluster_graph.build_task.validate(build_task)
            graph['tasks'].append(build_task)
@ -231,6 +252,25 @@ class Graph(object):
            graph['scopes'].append(define_task)
            graph['scopes'].extend(build_task['task'].get('scopes', []))

+            # Treeherder symbol configuration for the graph required for each
+            # build so tests know which platform they belong to.
+            build_treeherder_config = build_task['task']['extra']['treeherder']
+
+            if 'machine' not in build_treeherder_config:
+                message = '({}), extra.treeherder.machine required for all builds'
+                raise ValueError(message.format(build['task']))
+
+            if 'build' not in build_treeherder_config:
+                build_treeherder_config['build'] = \
+                    build_treeherder_config['machine']
+
+            if 'collection' not in build_treeherder_config:
+                build_treeherder_config['collection'] = { 'opt': True }
+
+            if len(build_treeherder_config['collection'].keys()) != 1:
+                message = '({}), extra.treeherder.collection must contain one type'
+                raise ValueError(message.fomrat(build['task']))
+
            for test in build['dependents']:
                test = test['allowed_build_tasks'][build['task']]
                test_parameters = copy.copy(build_parameters)
@ -251,6 +291,32 @@ class Graph(object):

                    test_task['requires'].append(test_parameters['build_slugid'])

+                    if 'treeherder' not in test_task['task']['extra']:
+                        test_task['task']['extra']['treeherder'] = {}
+
+                    # Copy over any treeherder configuration from the build so
+                    # tests show up under the same platform...
+                    test_treeherder_config = test_task['task']['extra']['treeherder']
+
+                    test_treeherder_config['collection'] = \
+                        build_treeherder_config.get('collection', {})
+
+                    test_treeherder_config['build'] = \
+                        build_treeherder_config.get('build', {})
+
+                    test_treeherder_config['machine'] = \
+                        build_treeherder_config.get('machine', {})
+
+                    if 'routes' not in test_task['task']:
+                        test_task['task']['routes'] = []
+
+                    if 'scopes' not in test_task['task']:
+                        test_task['task']['scopes'] = []
+
+                    if params['revision_hash']:
+                        test_task['task']['routes'].append(treeherder_route)
+                        test_task['task']['scopes'].append('queue:route:{}'.format(treeherder_route))
+
                    graph['tasks'].append(test_task)

                    define_task = DEFINE_TASK.format(
--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@ -69,7 +69,7 @@ tests:
    allowed_build_tasks:
      tasks/builds/b2g_desktop_opt.yml:
        task: tasks/tests/b2g_gaia_js_integration_tests.yml
-        chunks: 4
+        chunks: 10
  gaia-linter:
    allowed_build_tasks:
      tasks/builds/b2g_desktop_opt.yml:
--- a/testing/taskcluster/tasks/build.yml
+++ b/testing/taskcluster/tasks/build.yml
@ -10,7 +10,7 @@ task:
    source: http://todo.com/soon
    owner: {{owner}}

-  workerType: b2gbuild
+  workerType: build-c4-2xlarge
  provisionerId: aws-provisioner
  schedulerId: task-graph-scheduler

@ -19,6 +19,9 @@ task:
    # the board.
    - 'docker-worker:cache:tc-vcs'
    - 'docker-worker:image:{{#docker_image}}builder{{/docker_image}}'
+    - 'queue:define-task:aws-provisioner/build-c4-2xlarge'
+    - 'queue:create-task:aws-provisioner/build-c4-2xlarge'
+

  payload:
    image: '{{#docker_image}}builder{{/docker_image}}'
@ -48,4 +51,6 @@ task:

  extra:
    treeherder:
+      groupSymbol: tc
+      groupName: Submitted by taskcluster
      symbol: B
--- a/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
@ -2,7 +2,7 @@ $inherits:
  from: 'tasks/build.yml'
 task:
  metadata:
-    name: B2G Desktop {{build_type}}
+    name: "[TC] B2G Desktop {{build_type}}"
    description: B2G Desktop {{build_type}}

  scopes:
@ -25,6 +25,12 @@ task:
      - bin/build-b2g-desktop.sh

  extra:
+    treeherder:
+      groupSymbol: tc
+      groupName: Submitted by taskcluster
+      machine:
+        platform: b2g-linux64
+
    # Rather then enforcing particular conventions we require that all build
    # tasks provide the "build" extra field to specify where the build and tests
    # files are located.
--- a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml
@ -4,6 +4,11 @@ $inherits:
    build_type: 'debug'

 task:
+  extra:
+    treeherder:
+      collection:
+        debug: true
+
  payload:
    env:
      MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/debug'
--- a/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml
@ -4,10 +4,18 @@ task:
  scopes:
    - 'docker-worker:cache:build-emulator-ics-debug'
  metadata:
-    name: B2G Emulator ICS Debug
+    name: '[TC] B2G Emulator ICS Debug'
+  extra:
+    treeherder:
+      collection:
+        debug: true
+      machine:
+        platform: b2g-emu-ics
+
+
  payload:
    cache:
      build-emulator-ics-debug: /home/worker/object-folder
    env:
-      TARGET: 'emulator-ics'
+      TARGET: 'emulator'
      B2G_DEBUG: 1
--- a/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml
@ -4,12 +4,17 @@ task:
  scopes:
    - 'docker-worker:cache:build-emulator-ics-opt'
  metadata:
-    name: B2G Emulator ICS Opt
+    name: '[TC] B2G Emulator ICS Opt'
+
+  extra:
+    treeherder:
+      machine:
+        platform: b2g-emu-ics

  payload:
    cache:
      build-emulator-ics-opt: /home/worker/object-folder/

    env:
-      TARGET: 'emulator-ics'
+      TARGET: 'emulator'

--- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
@ -4,7 +4,15 @@ task:
  scopes:
    - 'docker-worker:cache:build-emulator-jb-debug'
  metadata:
-    name: B2G Emulator JB Debug
+    name: '[TC] B2G Emulator JB Debug'
+
+  extra:
+    treeherder:
+      collection:
+        debug: true
+      machine:
+        platform: b2g-emu-jb
+
  payload:
    cache:
      build-emulator-jb-debug: /home/worker/object-folder
--- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
@ -4,7 +4,12 @@ task:
  scopes:
    - 'docker-worker:cache:build-emulator-jb-opt'
  metadata:
-    name: B2G JB Emulator Opt
+    name: '[TC] B2G JB Emulator Opt'
+
+  extra:
+    treeherder:
+      machine:
+        platform: b2g-emu-jb

  payload:
    cache:
--- a/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml
@ -4,7 +4,15 @@ task:
  scopes:
    - 'docker-worker:cache:build-emulator-kk-debug'
  metadata:
-    name: B2G Emulator KK Debug
+    name: '[TC] B2G Emulator KK Debug'
+
+  extra:
+    treeherder:
+      collection:
+        debug: true
+      machine:
+        platform: b2g-emu-kk
+
  payload:
    cache:
      build-emulator-jb-debug: /home/worker/object-folder
--- a/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml
@ -4,7 +4,13 @@ task:
  scopes:
    - 'docker-worker:cache:build-emulator-kk-opt'
  metadata:
-    name: B2G KK Emulator Opt
+    name: '[TC] B2G KK Emulator Opt'
+
+  extra:
+    treeherder:
+      machine:
+        platform: b2g-emu-kk
+
  payload:
    cache:
      build-emulator-kk-opt: /home/worker/object-folder
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
@ -4,7 +4,16 @@ task:
  scopes:
    - 'docker-worker:cache:build-flame-kk-eng'
  metadata:
-    name: B2G Flame KK Eng
+    name: '[TC] B2G Flame KK Eng'
+
+  extra:
+    treeherder:
+      symbol: Be
+      groupSymbol: Flame-KK
+      groupName: Flame KitKat Device Image
+      machine:
+        platform: b2g-device-image
+
  payload:
    cache:
      build-flame-kk-eng: /home/worker/object-folder
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml
@ -4,7 +4,8 @@ task:
  scopes:
    - 'docker-worker:cache:build-flame-kk-opt'
  metadata:
-    name: B2G Flame KK Opt
+    name: '[TC] B2G Flame KK Opt'
+
  payload:
    cache:
      build-flame-kk-opt: /home/worker/object-folder
@ -12,6 +13,12 @@ task:
      TARGET: 'flame-kk'
      DEBUG: 0
  extra:
+    treeherder:
+      symbol: B
+      groupSymbol: Flame-KK
+      groupName: Flame KitKat Device Image
+      machine:
+        platform: b2g-device-image
    locations:
      img: 'private/build/flame-kk.zip'

--- a/testing/taskcluster/tasks/builds/b2g_nexus4_user.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus4_user.yml
@ -4,7 +4,8 @@ task:
  scopes:
    - 'docker-worker:cache:build-nexus-4-user'
  metadata:
-    name: B2G Nexus 4 User
+    name: '[TC] B2G Nexus 4 User'
+
  payload:
    cache:
      build-nexus-4-user: /home/worker/object-folder
@ -12,6 +13,12 @@ task:
      TARGET: 'nexus-4'
      DEBUG: 0
  extra:
+    treeherder:
+      symbol: B
+      groupSymbol: Nexus4
+      groupName: Nexus4 Device Image
+      machine:
+        platform: b2g-device-image
    locations:
      img: 'private/build/nexus-4.zip'

--- a/testing/taskcluster/tasks/builds/mulet_linux.yml
+++ b/testing/taskcluster/tasks/builds/mulet_linux.yml
@ -2,7 +2,7 @@ $inherits:
  from: 'tasks/build.yml'
 task:
  metadata:
-    name: Mulet Linux x64 Opt
+    name: '[TC] Mulet Linux x64 Opt'
    description: Mulet Linux x64 Opt

  scopes:
@ -25,6 +25,9 @@ task:
      - bin/build-mulet-linux.sh

  extra:
+    treeherder:
+      machine:
+        platform: mulet-linux64
    # Rather then enforcing particular conventions we require that all build
    # tasks provide the "build" extra field to specify where the build and tests
    # files are located.
--- a/testing/taskcluster/tasks/decision/branch.yml
+++ b/testing/taskcluster/tasks/decision/branch.yml
@ -51,7 +51,7 @@ tasks:
      payload:
        env:
          GECKO_BASE_REPOSITORY: 'https://hg.mozilla.org/mozilla-central'
-          GECKO_HEAD_REPOSITORY: '{{repository_url}}'
+          GECKO_HEAD_REPOSITORY: '{{url}}'
          GECKO_HEAD_REF: '{{revision}}'
          GECKO_HEAD_REV: '{{revision}}'

--- a/testing/taskcluster/tasks/decision/periodic_alder.yml
+++ b/testing/taskcluster/tasks/decision/periodic_alder.yml
@ -5,7 +5,7 @@ task:
  metadata:
    source: '{{source}}'
    owner: '{{owner}}'
-    name: Periodic task for testing.
+    name: 'Taskcluster decision task for {{project}}'
    description: |
      Decision task for testing purposes for alder.

--- a/testing/taskcluster/tasks/decision/try.yml
+++ b/testing/taskcluster/tasks/decision/try.yml
@ -1,42 +1,40 @@
 ---
 metadata:
-  name: 'Task graph used to build try jobs'
+  name: 'Taskcluster decision task for {{project}}'
  description: |
    Try push for {{owner}} with {{comment}}.
  owner: "{{owner}}"
-  source: "{{source}}"
+  source: "{{{source}}}"

 scopes:
-  - "docker-worker:image:quay.io/mozilla/decision:*"
  - "queue:define-task:aws-provisioner/gecko-decision"
  - "queue:create-task:aws-provisioner/gecko-decision"
-  - "docker-worker:cache:tc-vcs-public-sources"
-  - "docker-worker:cache:build-emulator-jb-opt"
-  - "docker-worker:cache:build-mulet-linux-objects"
-  - "docker-worker:cache:build-emulator-ics-opt"
-  - "queue:define-task:aws-provisioner/b2gtest"
-  - "queue:create-task:aws-provisioner/b2gtest"
-  - "docker-worker:image:quay.io/mozilla/builder:*"
-  - "docker-worker:cache:tooltool-cache"
-  - "queue:define-task:aws-provisioner/b2gbuild"
-  - "queue:create-task:aws-provisioner/b2gbuild"
-  - "docker-worker:cache:build-emulator-kk-debug"
-  - "docker-worker:cache:build-b2g-desktop-objects"
-  - "docker-worker:cache:build-emulator-kk-opt"
-  - "docker-worker:cache:build-emulator-jb-debug"
+  - "docker-worker:cache:*"
+  - "docker-worker:image:quay.io/mozilla/decision:0.0.3"
+  - "queue:route:tc-treeherder-stage.{{project}}.{{revision_hash}}"
+  - "queue:route:tc-treeherder.{{project}}.{{revision_hash}}"
+  - 'queue:define-task:aws-provisioner/test-c4-2xlarge'
+  - 'queue:create-task:aws-provisioner/test-c4-2xlarge'
+  - 'queue:define-task:aws-provisioner/build-c4-2xlarge'
+  - 'queue:create-task:aws-provisioner/build-c4-2xlarge'
  - "docker-worker:cache:tc-vcs"
+  - "docker-worker:image:quay.io/mozilla/builder:0.0.30"
+  - "queue:define-task:aws-provisioner/build-c4-2xlarge"
+  - "queue:create-task:aws-provisioner/build-c4-2xlarge"
  - "docker-worker:cache:sources-gecko"
-  - "docker-worker:cache:sources-gaia"
-  - "docker-worker:cache:build-emulator-ics-debug"
+  - "docker-worker:cache:build-mulet-linux-objects"
+  - "docker-worker:cache:tooltool-cache"
+  - "docker-worker:image:quay.io/mozilla/tester:0.0.9"
+
 tasks:
  - taskId: '{{#as_slugid}}decision task{{/as_slugid}}'
    task:
      created: '{{now}}'
      deadline: '{{#from_now}}1 day{{/from_now}}'
      metadata:
-        source: {{source}}
+        source: {{{source}}}
        owner: {{owner}}
-        name: Initial decision task for try
+        name: "[tc] Initial decision task for try ({{comment}})"
        description: |
          This is the single most important task as it decides how all other tasks
          get built.
@ -47,11 +45,16 @@ tasks:
      scopes:
        - "docker-worker:cache:tc-vcs-public-sources"
        - "docker-worker:image:quay.io/mozilla/decision:0.0.3"
+        - "queue:route:tc-treeherder-stage.{{project}}.{{revision_hash}}"
+        - "queue:route:tc-treeherder.{{project}}.{{revision_hash}}"
+
+      routes:
+        - "tc-treeherder-stage.{{project}}.{{revision_hash}}"

      payload:
        env:
          GECKO_BASE_REPOSITORY: 'https://hg.mozilla.org/mozilla-central'
-          GECKO_HEAD_REPOSITORY: '{{repository_url}}'
+          GECKO_HEAD_REPOSITORY: '{{{url}}}'
          GECKO_HEAD_REF: '{{revision}}'
          GECKO_HEAD_REV: '{{revision}}'

@ -80,6 +83,7 @@ tasks:
            --project='{{project}}'
            --message='{{comment}}'
            --owner='{{owner}}'
+            --revision-hash='{{revision_hash}}'
            --extend-graph > /home/worker/graph.json
        graphs:
          - /home/worker/graph.json
--- a/testing/taskcluster/tasks/job_flags.yml
+++ b/testing/taskcluster/tasks/job_flags.yml
@ -142,10 +142,10 @@ tests:
    allowed_build_tasks:
      tasks/builds/b2g_desktop_opt.yml:
        task: tasks/tests/b2g_gaia_js_integration_tests.yml
-        chunks: 4
+        chunks: 10
      tasks/builds/b2g_desktop_debug.yml:
        task: tasks/tests/b2g_gaia_js_integration_tests.yml
-        chunks: 4
+        chunks: 10
  gaia-linter:
    allowed_build_tasks:
      tasks/builds/b2g_desktop_opt.yml:
--- a/testing/taskcluster/tasks/test.yml
+++ b/testing/taskcluster/tasks/test.yml
@ -5,10 +5,20 @@ task:
  metadata:
    source: http://todo.com/soon
    owner: {{owner}}
-  workerType: b2gtest
+  workerType: test-c4-2xlarge
  provisionerId: aws-provisioner
  schedulerId: task-graph-scheduler

+  scopes:
+    - 'docker-worker:image:{{#docker_image}}tester{{/docker_image}}'
+    - 'queue:define-task:aws-provisioner/test-c4-2xlarge'
+    - 'queue:create-task:aws-provisioner/test-c4-2xlarge'
+
  payload:
    image: '{{#docker_image}}tester{{/docker_image}}'
    maxRunTime: 3600
+
+  extra:
+    treeherder:
+      groupSymbol: tc
+      groupName: Submitted by taskcluster
--- a/testing/taskcluster/tasks/tests/b2g_build_test.yml
+++ b/testing/taskcluster/tasks/tests/b2g_build_test.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Gaia Build Test
+    name: '[TC] Gaia Build Test'
    description: Gaia Build Test test run

  scopes:
--- a/testing/taskcluster/tasks/tests/b2g_build_unit.yml
+++ b/testing/taskcluster/tasks/tests/b2g_build_unit.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Gaia Build Unit Test
+    name: '[TC] Gaia Build Unit Test'
    description: Gaia Build Unit Test

  scopes:
--- a/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: CPP Unit Tests
+    name: '[TC] CPP Unit Tests'
    description: CPP Unit Tests test run

  payload:
--- a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Crashtest
+    name: '[TC] Crashtest'
    description: Crashtest test run {{chunk}}

  payload:
@ -31,6 +31,6 @@ task:
  extra:
    treeherder:
      groupName: Reftest
-      groupSymbol: R
+      groupSymbol: tc-R
      symbol: 'C{{chunk}}'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: JSReftest
+    name: '[TC] JSReftest'
    description: JSReftest test run {{chunk}}

  payload:
@ -30,6 +30,6 @@ task:
  extra:
    treeherder:
      groupName: Reftest
-      groupSymbol: R
+      groupSymbol: tc-R
      symbol: 'J{{chunk}}'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Marionette Framework Unit Tests
+    name: '[TC] Marionette Framework Unit Tests'
    description: Marionette Framework Unit Tests test run

  payload:
--- a/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Marionette WebAPI Tests
+    name: '[TC] Marionette WebAPI Tests'
    description: Marionette WebAPI test run

  payload:
--- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Mochitest
+    name: '[TC] Mochitest'
    description: Mochitest test run {{chunk}}

  payload:
@ -32,6 +32,6 @@ task:
  extra:
    treeherder:
      groupName: Mochitest
-      groupSymbol: M
+      groupSymbol: tc-M
      symbol: '{{chunk}}'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Mochitest
+    name: '[TC] Mochitest'
    description: Mochitest Media test run

  payload:
@ -30,6 +30,6 @@ task:
  extra:
    treeherder:
      groupName: Mochitest
-      groupSymbol: M
+      groupSymbol: tc-M
      symbol: M
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Reftest
+    name: '[TC] Reftest'
    description: Reftest test run {{chunk}}

  payload:
@ -30,6 +30,6 @@ task:
  extra:
    treeherder:
      groupName: Reftest
-      groupSymbol: R
+      groupSymbol: tc-R
      symbol: 'R{{chunk}}'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: XPCShell
+    name: '[TC] XPCShell'
    description: XPCShell test run

  payload:
--- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: XPCShell
+    name: '[TC] XPCShell'
    description: XPCShell test run {{chunk}}

  payload:
--- a/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Gaia JS Integration Test
+    name: '[TC] Gaia JS Integration Test'
    description: Gaia JS Integration Test run {{chunk}}

  scopes:
@ -37,6 +37,6 @@ task:
  extra:
    treeherder:
      groupName: Gaia JS Integration Test
-      groupSymbol: Gij
+      groupSymbol: tc-Gij
      symbol: '{{chunk}}'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Gaia Python Accessibility Integration Tests
+    name: '[TC] Gaia Python Accessibility Integration Tests'
    description: Gaia Python Accessibility Integration Tests run {{chunk}}

  scopes:
@ -37,6 +37,6 @@ task:
  extra:
    treeherder:
      groupName: Gaia Python Integration Tests
-      groupSymbol: Gip
+      groupSymbol: tc-Gip
      symbol: 'a'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Gaia Python Functional Integration Tests
+    name: '[TC] Gaia Python Functional Integration Tests'
    description: Gaia Python Functional Integration Tests run {{chunk}}

  scopes:
@ -39,6 +39,6 @@ task:
  extra:
    treeherder:
      groupName: Gaia Python Integration Tests
-      groupSymbol: Gip
+      groupSymbol: tc-Gip
      symbol: 'f{{chunk}}'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Gaia Python Integration Unit Tests
+    name: '[TC] Gaia Python Integration Unit Tests'
    description: Gaia Python Integration Unit Tests run {{chunk}}

  scopes:
@ -37,6 +37,6 @@ task:
  extra:
    treeherder:
      groupName: Gaia Python Integration Tests
-      groupSymbol: Gip
+      groupSymbol: tc-Gip
      symbol: 'u'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Gaia Unit Test
+    name: '[TC] Gaia Unit Test'
    description: Gaia Unit Test

  scopes:
--- a/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Gaia Unit Test OOP
+    name: '[TC] Gaia Unit Test OOP'
    description: Gaia Unit Test OOP

  scopes:
--- a/testing/taskcluster/tasks/tests/b2g_gip_oop.yml
+++ b/testing/taskcluster/tasks/tests/b2g_gip_oop.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Gaia Python Integration Tests OOP
+    name: '[TC] Gaia Python Integration Tests OOP'
    description: Gaia Python Functional Integration Tests OOP test run

  scopes:
@ -37,6 +37,6 @@ task:
  extra:
    treeherder:
      groupName: Gaia Python Integration Tests OOP
-      groupSymbol: Gip-oop
+      groupSymbol: tc-Gip-oop
      symbol: 'Gip-oop'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_linter.yml
+++ b/testing/taskcluster/tasks/tests/b2g_linter.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Linter Test
+    name: '[TC] Gaia Linter'
    description: Linter Test
  scopes:
    - 'docker-worker:cache:sources-gaia'
--- a/testing/taskcluster/tasks/tests/b2g_mochitest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_mochitest.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: B2G Mochitests {{chunk}}
+    name: '[TC] B2G Mochitests {{chunk}}'
    description: B2G Desktop Mochi test run {{chunk}}

  payload:
@ -27,5 +27,7 @@ task:

  extra:
    treeherder:
-      symbol: B
+      groupName: Mochitest
+      groupSymbol: tc-M
+      symbol: {{chunk}}

--- a/testing/taskcluster/tasks/tests/b2g_mochitest_oop.yml
+++ b/testing/taskcluster/tasks/tests/b2g_mochitest_oop.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Mochitest OOP
+    name: '[TC] Mochitest OOP'
    description: Mochitest OOP test run {{chunk}}

  payload:
@ -30,6 +30,6 @@ task:
  extra:
    treeherder:
      groupName: Mochitest OOP
-      groupSymbol: M-oop
+      groupSymbol: tc-M-oop
      symbol: '{{chunk}}'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_reftests.yml
+++ b/testing/taskcluster/tasks/tests/b2g_reftests.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Reftest
+    name: '[TC] Reftest'
    description: Reftest test run {{chunk}}

  payload:
@ -29,6 +29,6 @@ task:
  extra:
    treeherder:
      groupName: Reftest
-      groupSymbol: R
+      groupSymbol: tc-R
      symbol: 'R{{chunk}}'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_reftests_sanity_oop.yml
+++ b/testing/taskcluster/tasks/tests/b2g_reftests_sanity_oop.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Reftest Sanity OOP
+    name: '[TC] Reftest Sanity OOP'
    description: Reftest Sanity OOP test run {{chunk}}

  payload:
@ -31,6 +31,6 @@ task:
  extra:
    treeherder:
      groupName: Reftest Sanity OOP
-      groupSymbol: Rs-oop
+      groupSymbol: tc-Rs-oop
      symbol: 'Rs-oop'
      productName: b2g
--- a/testing/taskcluster/tasks/tests/mulet_mochitests.yml
+++ b/testing/taskcluster/tasks/tests/mulet_mochitests.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Mulet Mochitests {{chunk}}
+    name: '[TC] Mulet Mochitests {{chunk}}'
    description: Mulet Mochi test run {{chunk}}

  payload:
@ -28,5 +28,7 @@ task:

  extra:
    treeherder:
-      symbol: M
+      group_symbol: M
+      group_name: Mulet mochitests
+      symbol: {{chunk}}

--- a/testing/taskcluster/tasks/tests/mulet_reftests.yml
+++ b/testing/taskcluster/tasks/tests/mulet_reftests.yml
@ -3,7 +3,7 @@ $inherits:
  from: 'tasks/test.yml'
 task:
  metadata:
-    name: Reftest
+    name: '[TC] Reftest'
    description: Reftest test run {{chunk}}

  scopes:
@ -40,6 +40,6 @@ task:
  extra:
    treeherder:
      groupName: Reftest
-      groupSymbol: R
+      groupSymbol: tc-R
      symbol: 'R{{chunk}}'
      productName: b2g