Categorize bots by ports instead of core/non-core separation

https://bugs.webkit.org/show_bug.cgi?id=75766

Reviewed by Adam Barth.

Get rid of the concept of core/non-core builders, and categorize build bots by ports instead.

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(loadBuilderConfig):
* BuildSlaveSupport/build.webkit.org-config/templates/root.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@104413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index f2ce836c8bb8710f063fb228befa891ef950a41f..00dff0cea431a6e0edb47040ce4158f9cf472694 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -20,7 +20,6 @@ import urllib
 
 from committer_auth import CommitterAuth
 from webkitpy.common.config import build as wkbuild
-from webkitpy.common.net.buildbot import BuildBot as wkbuildbot
 
 
 c = BuildmasterConfig = {}
@@ -766,9 +765,6 @@ def loadBuilderConfig(c):
     passwords = simplejson.load(open('passwords.json'))
     config = simplejson.load(open('config.json'))
 
-    # use webkitpy's buildbot module to test for core builders
-    wkbb = wkbuildbot()
-
     c['slaves'] = [BuildSlave(slave['name'], passwords[slave['name']], max_builds=1) for slave in config['slaves']]
 
     c['schedulers'] = []
@@ -798,6 +794,8 @@ def loadBuilderConfig(c):
 
                 break
 
+        platform = builder['platform']
+
         factory = globals()["%sFactory" % builder.pop('type')]
         factoryArgs = []
         for key in "platform", "configuration", "architectures", "triggers":
@@ -812,9 +810,18 @@ def loadBuilderConfig(c):
 
         builder["factory"] = factory(*factoryArgs, **factoryKwArgs)
 
-        builder["category"] = "noncore"
-        if wkbb._is_core_builder(builder['name']):
-            builder["category"] = "core"
+        if platform.startswith('chromium'):
+            builder["category"] = 'Chromium'
+        elif platform == 'win':
+            builder["category"] = 'Windows'
+        elif platform.startswith('gtk'):
+            builder["category"] = 'GTK'
+        elif platform.startswith('qt'):
+            builder["category"] = 'Qt'
+        elif platform.startswith('mac'):
+            builder["category"] = 'Mac'
+        else:
+            builder["category"] = 'Others'
 
         c['builders'].append(builder)
 

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html b/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html
index b2587cc2afe99aa16edad7be92f12b3dbec2be92..a8b359b0d682c49ed3b67da66c087097c591d226 100755 (executable)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html
@@ -9,10 +9,13 @@
 <h1>Welcome to the Buildbot!</h1>
 
 <ul>
-  <li><a href="console?category=core">Core Console</a></li>
-  <li><a href="waterfall?category=core">Core Waterfall</a></li>
-  <li><a href="console">Console</a></li>
-  <li><a href="waterfall">Waterfall Display</a> will give you a time-oriented summary of recent buildbot activity.</li>
+  <li><a href="console">Console</a> - <a href="console?category=Mac">Mac</a>, <a href="console?category=Windows">Windows</a>,
+  <a href="console?category=GTK">GTK+</a>, <a href="console?category=Qt">Qt</a>, <a href="console?category=Chromium">Chromium</a>,
+  and <a href="console?category=Others">Others</a></li>
+  <li><a href="waterfall">Waterfall Display</a>, a time-oriented summary of recent buildbot activity
+  - <a href="waterfall?category=Mac">Mac</a>, <a href="waterfall?category=Windows">Windows</a>,
+  <a href="waterfall?category=GTK">GTK+</a>, <a href="waterfall?category=Qt">Qt</a>, <a href="waterfall?category=Chromium">Chromium</a>,
+  and <a href="waterfall?category=Others">Others</a></li>
   <li><a href="one_box_per_builder">Latest Build</a> for each builder is here.</li>
   <li><a href="one_line_per_build">Recent Builds</a> are summarized here, one per line.</li>
   <li><a href="buildslaves">Buildslave</a> information</li>

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index cc010975a7e1e376d59bce5988dca8021aafb509..6c9a7b9120d415f7d59070811ef4f24cb9fa2f47 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2012-01-08  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Categorize bots by ports instead of core/non-core separation
+        https://bugs.webkit.org/show_bug.cgi?id=75766
+
+        Reviewed by Adam Barth.
+
+        Get rid of the concept of core/non-core builders, and categorize build bots by ports instead.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (loadBuilderConfig):
+        * BuildSlaveSupport/build.webkit.org-config/templates/root.html:
+
 2012-01-08  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r104403.