[zorg] r237318 - Prepare the list of standard builders once with all the filtering in one place.

[Galina Kistanova]

Author: gkistanova
Date: Wed May 13 18:51:05 2015
New Revision: 237318

URL: http://llvm.org/viewvc/llvm-project?rev=237318&view=rev
Log:
Prepare the list of standard builders once with all the filtering in one place.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/status.py
    zorg/trunk/buildbot/osuosl/master/master.cfg

Modified: zorg/trunk/buildbot/osuosl/master/config/status.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/status.py?rev=237318&r1=237317&r2=237318&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/status.py Wed May 13 18:51:05 2015
@@ -12,7 +12,7 @@ from zorg.buildbot.util.InformativeMailN
 # pushed to these targets. buildbot/status/*.py has a variety to choose from,
 # including web pages, email senders, and IRC bots.
 
-def get_status_targets(standard_builders):
+def get_status_targets(standard_builders, standard_categories=None):
 
     from buildbot.status import html
     from buildbot.status.web import auth, authz
@@ -30,18 +30,6 @@ def get_status_targets(standard_builders
 
     default_email = config.options.get('Master Options', 'default_email')
 
-    # The LNT performance buildbots have a very long delay and commonly fail
-    # late and if they fail, all of them fail together. As the same failures
-    # are are normally also catched by the faster non-LNT bots, there is no need
-    # to warn everybody about failures in the performance bots. Tobias Grosser
-    # will keep track of such.
-    standard_builders = [b for b in standard_builders if not b.startswith('perf-x86_64')]
-
-    # TODO: Fix buildbot.status.words.IRC to accept a list of builders to report
-    # instead of defining categories to report. Otherwise we could report more
-    # than requested.    
-    standard_categories = [b['category'] for b in standard_builders]
-
     return [
         buildbot.status.html.WebStatus(
             http_port = 8011, authz=authz_cfg),

Modified: zorg/trunk/buildbot/osuosl/master/master.cfg
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/master.cfg?rev=237318&r1=237317&r2=237318&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Wed May 13 18:51:05 2015
@@ -77,10 +77,25 @@ c['builders'] = builders = list(config.b
 
 ####### STATUS TARGETS
 
-# Schedule builds and email for all non-experimental builders.
+# Schedule builds and email for all non-experimental and non-LNT builders.
+# The LNT performance buildbots have a very long delay and commonly fail
+# late and if they fail, all of them fail together. As the same failures
+# are are normally also catched by the faster non-LNT bots, there is no need
+# to warn everybody about failures in the performance bots. Tobias Grosser
+# will keep track of such.
 standard_builders = [b['name'] for b in builders
-                     if not b['category'].endswith('.exp')]
-c['status'] = config.status.get_status_targets(standard_builders)
+                     if not b['category'].endswith('.exp') and
+                        not b['name'].startswith('perf-x86_64')]
+
+# TODO: Fix buildbot.status.words.IRC to accept a list of builders to report
+# instead of defining categories to report. Otherwise we could report more
+# than requested.
+standard_categories = [b['category'] for b in builders
+                       if not b['category'].endswith('.exp') and
+                          not b['name'].startswith('perf-x86_64')]
+
+c['status'] = config.status.get_status_targets(standard_builders,
+                                               standard_categories)
 
 ####### SCHEDULERS