Bug 1364196 - Ensure perfherder_extra_options always present; r=ted

Previously, only the mach resource metrics consulted
perfherder_extra_options. This resulted in many data sets tracking
values for distinct build configurations.

MozReview-Commit-ID: 6t5UaUUvHxT

--HG--
extra : rebase_source : aa832250bbbbe1ffb3e0288f1a9cde5c1399ff10

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -2037,6 +2037,12 @@ or run without that action (ie: --no-{action})"
             perfherder_data['suites'].append(build_metrics)
         perfherder_data['suites'].extend(self._load_sccache_stats())
 
+        # Ensure all extra options for this configuration are present.
+        for opt in self.config.get('perfherder_extra_options', []):
+            for suite in perfherder_data['suites']:
+                if opt not in suite.get('extraOptions', []):
+                    suite.setdefault('extraOptions', []).append(opt)
+
         if self.query_is_nightly():
             for suite in perfherder_data['suites']:
                 suite.setdefault('extraOptions', []).insert(0, 'nightly')