Changeset 91144 in webkit

Timestamp:

Jul 15, 2011 9:03:18 PM (13 years ago)

Author:

abarth@webkit.org

Message:

gardening server should proxy buildbot status for garden-o-matic
​https://bugs.webkit.org/show_bug.cgi?id=64588

Reviewed by Eric Seidel.

This information will be used to detect build breaks. I took this
opportunity to make ChromiumBuildBot non-static.

• Scripts/webkitpy/common/host.py:
• Scripts/webkitpy/tool/commands/rebaseline.py:
• Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
• Scripts/webkitpy/tool/mocktool.py:
• Scripts/webkitpy/tool/servers/gardeningserver.py:
• Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/host.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/rebaseline.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/rebaseline_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/mocktool.py (modified) (3 diffs)
• Scripts/webkitpy/tool/servers/gardeningserver.py (modified) (1 diff)
• Scripts/webkitpy/tool/servers/gardeningserver_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-15  Adam Barth  <abarth@webkit.org>
+
+        gardening server should proxy buildbot status for garden-o-matic
+        https://bugs.webkit.org/show_bug.cgi?id=64588
+
+        Reviewed by Eric Seidel.
+
+        This information will be used to detect build breaks.  I took this
+        opportunity to make ChromiumBuildBot non-static.
+
+        * Scripts/webkitpy/common/host.py:
+        * Scripts/webkitpy/tool/commands/rebaseline.py:
+        * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+        * Scripts/webkitpy/tool/servers/gardeningserver.py:
+        * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
+
 2011-07-15  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/host.py

@@ -32 +32 @@
 from webkitpy.common.checkout.scm import default_scm
 from webkitpy.common.config.ports import WebKitPort
+from webkitpy.common.memoized import memoized
 from webkitpy.common.net import bugzilla, buildbot, statusserver, web
+from webkitpy.common.net.buildbot.chromiumbuildbot import ChromiumBuildBot
 from webkitpy.common.net.irc import ircproxy
 from webkitpy.common.system import executive, filesystem, platforminfo, user, workspace
@@ -68 +70 @@
         return self._port
 
+    @memoized
+    def chromium_buildbot(self):
+        return ChromiumBuildBot()
+
     def ensure_irc_connected(self, irc_delegate):
         if not self._irc:

trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

@@ -34 +34 @@
 import webkitpy.common.config.urls as config_urls
 from webkitpy.common.net.buildbot import BuildBot
-from webkitpy.common.net.buildbot.chromiumbuildbot import ChromiumBuildBot
 from webkitpy.common.net.layouttestresults import LayoutTestResults
 from webkitpy.common.system.user import User
@@ -93 +92 @@
     def _results_url(self, builder_name):
         # FIXME: Generalize this command to work with non-build.chromium.org builders.
-        # FIXME: We should really get the buildbot from the tool!
-        builder = ChromiumBuildBot().builder_with_name(builder_name)
+        builder = self._tool.chromium_buildbot().builder_with_name(builder_name)
         return builder.accumulated_results_url()
 

trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

@@ -49 +49 @@
         command.bind_to_tool(MockTool())
         build = Mock()
-        expected_stdout = "Retrieving http://build.chromium.org/f/chromium/layout_test_results/Webkit_Linux/results/layout-test-results/userscripts/another-test-actual.txt ...\n"
+        expected_stdout = "Retrieving http://example.com/f/builders/Webkit Linux/results//userscripts/another-test-actual.txt ...\n"
         OutputCapture().assert_outputs(self, command._rebaseline_test, ["Webkit Linux", "userscripts/another-test.html", "txt"], expected_stdout=expected_stdout)
 

trunk/Tools/Scripts/webkitpy/tool/mocktool.py

@@ -401 +401 @@
         return "http://example.com/builders/%s/results/" % self.name()
 
+    def accumulated_results_url(self):
+        return "http://example.com/f/builders/%s/results/" % self.name()
+
     def force_build(self, username, comments):
         log("MOCK: force_build: name=%s, username=%s, comments=%s" % (
@@ -836 +839 @@
         self.user = MockUser()
         self._scm = MockSCM()
+        self._chromium_buildbot = MockBuildBot()
         # Various pieces of code (wrongly) call filesystem.chdir(checkout_root).
         # Making the checkout_root exist in the mock filesystem makes that chdir not raise.
@@ -852 +856 @@
         return self._checkout
 
+    def chromium_buildbot(self):
+        return self._chromium_buildbot
+
     def ensure_irc_connected(self, delegate):
         if not self._irc:

trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py

@@ -69 +69 @@
             self._serve_json(commit_info.to_json())
 
+    def buildbot(self):
+        builder_statuses = self.server.tool.chromium_buildbot().builder_statuses()
+        self._serve_json(builder_statuses)
+
     def rollout(self):
         revision = self.query['revision'][0]

trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py

@@ -78 +78 @@
         self._post_to_path("/changelog?revision=2314", expected_stderr=expected_stderr, expected_stdout=expected_stdout)
 
+    def test_buildbot(self):
+        expected_stdout = '== Begin JSON Response ==\n[{"is_green": true, "name": "Builder1", "activity": "building"}, {"is_green": true, "name": "Builder2", "activity": "idle"}]\n== End JSON Response ==\n'
+        self._post_to_path("/buildbot", expected_stdout=expected_stdout, expected_stderr='')
+
     def test_rollout(self):
         expected_stderr = "MOCK run_command: ['echo', 'rollout', '--force-clean', '--non-interactive', '2314', 'MOCK rollout reason']\n"