From 4eb4448f3f16e7a8689820822a8ae930065685b5 Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Thu, 11 May 2017 13:28:38 -0700 Subject: [PATCH] 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index 16d76e6c2ffb..3528543aab16 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/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')