Bug 1465659 - Check perfherder options across all build kinds. r=dustin

--HG--
extra : rebase_source : f2e05ac7544542c0a9a93b6c07f884857366c2c2

taskcluster/taskgraph/transforms/build_lints.py

@@ -12,6 +12,8 @@ from taskgraph.transforms.base import TransformSequence
 
 transforms = TransformSequence()
 
+SEEN_CONFIGS = {}
+
 
 @transforms.add
 def check_mozharness_perfherder_options(config, jobs):
@@ -26,7 +28,6 @@ def check_mozharness_perfherder_options(config, jobs):
     to the same bucket by looking for jobs not defining extra options when
     their platform or mozharness config are otherwise similar.
     """
-    seen_configs = {}
 
     for job in jobs:
         if job['run']['using'] != 'mozharness':
@@ -47,12 +48,13 @@ def check_mozharness_perfherder_options(config, jobs):
 
         key = (platform, primary_config, nightly, options)
 
-        if key in seen_configs:
+        if key in SEEN_CONFIGS:
-            raise Exception('Non-unique Perfherder data collection for jobs '
+            raise Exception(
-                            '%s and %s: set PERFHERDER_EXTRA_OPTIONS in worker '
+                'Non-unique Perfherder data collection for jobs %s-%s and %s: '
-                            'environment variables or use different mozconfigs'
+                'set PERFHERDER_EXTRA_OPTIONS in worker environment variables '
-                            % (job['name'], seen_configs[key]))
+                'or use different mozconfigs'
+                % (config.kind, job['name'], SEEN_CONFIGS[key]))
 
-        seen_configs[key] = job['name']
+        SEEN_CONFIGS[key] = '{}-{}'.format(config.kind, job['name'])
 
         yield job