From de715138fa7188ffd5680aabdfd729161b6eb7c9 Mon Sep 17 00:00:00 2001 From: Chris AtLee Date: Tue, 7 Jul 2009 08:24:47 -0400 Subject: [PATCH] Updating to use the new graph server URL Don't need to skip talos-rev2 machines any more Support having per-branch email notification lists, and update TraceMonkey to not send to the dev-tree-management list any more. --HG-- branch : 1.0 --- treeherder/perfalert/perfalert/analysis.cfg | 3 ++- treeherder/perfalert/perfalert/analyze_graphapi.py | 4 ---- treeherder/perfalert/perfalert/analyze_talos.py | 8 ++++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/treeherder/perfalert/perfalert/analysis.cfg b/treeherder/perfalert/perfalert/analysis.cfg index 7c8bfd0b1..8b82073d1 100644 --- a/treeherder/perfalert/perfalert/analysis.cfg +++ b/treeherder/perfalert/perfalert/analysis.cfg @@ -1,6 +1,6 @@ [main] base_hg_url = http://hg.mozilla.org -base_graph_url = http://graphs-new.mozilla.org +base_graph_url = http://graphs.mozilla.org warning_history = warning_history.json pushdates = pushdates.json method = graphapi @@ -34,3 +34,4 @@ repo_path = releases/mozilla-1.9.1 [TraceMonkey] repo_path = tracemonkey +regression_emails = catlee@mozilla.com, rsayre@mozilla.com diff --git a/treeherder/perfalert/perfalert/analyze_graphapi.py b/treeherder/perfalert/perfalert/analyze_graphapi.py index 6d0302cf2..4c11982ce 100644 --- a/treeherder/perfalert/perfalert/analyze_graphapi.py +++ b/treeherder/perfalert/perfalert/analyze_graphapi.py @@ -75,10 +75,6 @@ class GraphAPISource: if "GFX" in test_name: continue - # Skip talos-rev2 slaves - if "talos-rev2" in machine_name: - continue - series = TestSeries(branch_id, branch_info['name'], os_id, os_info['name'], test_id, test_name) diff --git a/treeherder/perfalert/perfalert/analyze_talos.py b/treeherder/perfalert/perfalert/analyze_talos.py index f323c63d8..e61433ff5 100644 --- a/treeherder/perfalert/perfalert/analyze_talos.py +++ b/treeherder/perfalert/perfalert/analyze_talos.py @@ -323,8 +323,12 @@ class AnalysisRunner: def emailWarning(self, series, d, state, last_good): addresses = [] - if state == 'regression' and self.config.has_option('main', 'regression_emails'): - addresses.extend(self.config.get('main', 'regression_emails').split(",")) + if state == 'regression': + branch = series.branch_name + if self.config.has_option(branch, 'regression_emails'): + addresses.extend(self.config.get(branch, 'regression_emails').split(",")) + elif self.config.has_option('main', 'regression_emails'): + addresses.extend(self.config.get('main', 'regression_emails').split(",")) if state == 'machine' and self.config.has_option('main', 'machine_emails'): addresses.extend(self.config.get('main', 'machine_emails').split(","))