Bug 1374940 - Cleanup how toolchain names are derived from task labels. r=dustin
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 19 Jul 2017 07:19:11 +0900
changeset 418754 b5390e7949af282c6709f93d382368b16512c191
parent 418753 9943df835008f92ce77784b338efb62e77da0e3d
child 418755 eac3bc21f3708cf404a1115c57addedcd0104bb1
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1374940, 1345863
milestone56.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 1374940 - Cleanup how toolchain names are derived from task labels. r=dustin We don't need to hardcode that they are prefixed with "toolchain-", when they, in fact, are prefixed with the name of the kind being handled. Also, we used to need to remove a /opt suffix, but bug 1345863 removed those suffixes, so we don't need to remove it anymore.
taskcluster/taskgraph/transforms/job/toolchain.py
--- a/taskcluster/taskgraph/transforms/job/toolchain.py
+++ b/taskcluster/taskgraph/transforms/job/toolchain.py
@@ -46,17 +46,17 @@ def add_optimizations(config, run, taskd
     files = list(run.get('resources', []))
     # This file
     files.append('taskcluster/taskgraph/transforms/job/toolchain.py')
     # The script
     files.append('taskcluster/scripts/misc/{}'.format(run['script']))
 
     label = taskdesc['label']
     subs = {
-        'name': label.replace('toolchain-', '').split('/')[0],
+        'name': label.replace('%s-' % config.kind, ''),
         'digest': hash_paths(GECKO, files),
     }
 
     optimizations = taskdesc.setdefault('optimizations', [])
 
     # We'll try to find a cached version of the toolchain at levels above
     # and including the current level, starting at the highest level.
     for level in reversed(range(int(config.params['level']), 4)):