Bug 1280356 - Allow tc tests to define extra.treeherder.machine; r=dustin
authorGeoff Brown <gbrown@mozilla.com>
Mon, 20 Jun 2016 11:39:39 -0600
changeset 302103 4a25006fb0ead19d818f6f030ed263ffe5f168a2
parent 302102 c4be443b20d068b1a18b6929c6e2f76fef4de235
child 302104 5ac935a39dc2e72296b004c5ee4089f94b8832d4
push id78594
push usergbrown@mozilla.com
push dateMon, 20 Jun 2016 17:39:52 +0000
treeherdermozilla-inbound@5ac935a39dc2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1280356
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1280356 - Allow tc tests to define extra.treeherder.machine; r=dustin
taskcluster/taskgraph/kind/legacy.py
--- a/taskcluster/taskgraph/kind/legacy.py
+++ b/taskcluster/taskgraph/kind/legacy.py
@@ -111,18 +111,19 @@ def configure_dependent_task(task_path, 
     treeherder_config = task['task']['extra']['treeherder']
 
     treeherder_config['collection'] = \
         build_treeherder_config.get('collection', {})
 
     treeherder_config['build'] = \
         build_treeherder_config.get('build', {})
 
-    treeherder_config['machine'] = \
-        build_treeherder_config.get('machine', {})
+    if 'machine' not in treeherder_config:
+        treeherder_config['machine'] = \
+            build_treeherder_config.get('machine', {})
 
     if 'routes' not in task['task']:
         task['task']['routes'] = []
 
     if 'scopes' not in task['task']:
         task['task']['scopes'] = []
 
     return task