Backed out changeset b17f8ba4211d for Gecko Decision task bustage. CLOSED TREE

taskcluster/taskgraph/transforms/build.py

@@ -11,7 +11,6 @@ from __future__ import absolute_import, print_function, unicode_literals
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.attributes import RELEASE_PROJECTS
 from taskgraph.util.schema import resolve_keyed_by
-from taskgraph.util.treeherder import add_suffix
 from taskgraph.util.workertypes import worker_type_implementation
 
 from mozbuild.artifact_builds import JOB_CHOICES as ARTIFACT_JOBS
@@ -132,7 +131,7 @@ def use_artifact(config, jobs):
             # If tests aren't packaged, then we are not able to rebuild all the packages
             and job['worker']['env'].get('MOZ_AUTOMATION_PACKAGE_TESTS') == '1'
         ):
-            job['treeherder']['symbol'] = add_suffix(job['treeherder']['symbol'], 'a')
+            job['treeherder']['symbol'] += 'a'
             job['worker']['env']['USE_ARTIFACT'] = '1'
             job['attributes']['artifact-build'] = True
         yield job

taskcluster/taskgraph/util/treeherder.py

@@ -5,8 +5,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 import re
 
-_JOINED_SYMBOL_RE = re.match(r'([^(]*)\(([^)]*)\)$')
-
 
 def split_symbol(treeherder_symbol):
     """Split a symbol expressed as grp(sym) into its two parts.  If no group is
@@ -14,11 +12,7 @@ def split_symbol(treeherder_symbol):
     groupSymbol = '?'
     symbol = treeherder_symbol
     if '(' in symbol:
-        match = _JOINED_SYMBOL_RE.match(symbol)
-        if match:
-            groupSymbol, symbol = match
-        else:
-            raise Exception("`{}` is not a valid treeherder symbol.".format(symbol))
+        groupSymbol, symbol = re.match(r'([^(]*)\(([^)]*)\)', symbol).groups()
     return groupSymbol, symbol