2006-09-15 Mark Rowe <opendarwin.org@bdash.net.nz>
authorbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Sep 2006 00:55:22 +0000 (00:55 +0000)
committerbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Sep 2006 00:55:22 +0000 (00:55 +0000)
        Reviewed by Brady.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=10635
        Bug 10635: Buildbot configuration in SVN is out of sync with build.webkit.org

        * BuildSlaveSupport/build.webkit.org-config/webkit/builders.py: Reorder build slaves within build factories in an attempt to spread the load evenly.
        * BuildSlaveSupport/build.webkit.org-config/webkit/status.py: Return to sending status emails to <svnuser>@opensource.apple.com addresses.
        * BuildSlaveSupport/build.webkit.org-config/webkit/steps.py: Update configuration to match changes in Buildbot.  Always do clean SVG builds.

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

WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/builders.py
WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/status.py
WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/steps.py
WebKitTools/ChangeLog

index 7795f8a7fb86901afb36884b933353612f32d6ea..b74effc99276176312f84251b177bcec5b76474a 100644 (file)
@@ -1,11 +1,11 @@
 from webkit.factories import *
 
-_builders = [('post-commit-powerpc-mac-os-x', StandardBuildFactory, ['apple-slave-6', 'apple-slave-5', 'apple-slave-3']),
-             ('post-commit-leaks-powerpc-mac-os-x', LeakBuildFactory, ['apple-slave-5', 'apple-slave-3', 'apple-slave-6']),
-             ('post-commit-pixel-powerpc-mac-os-x', PixelTestBuildFactory, ['apple-slave-3', 'apple-slave-5', 'apple-slave-6']),
+_builders = [('post-commit-powerpc-mac-os-x', StandardBuildFactory, ['apple-slave-6', 'apple-slave-5'])
+             ('post-commit-leaks-powerpc-mac-os-x', LeakBuildFactory, ['apple-slave-5', 'apple-slave-6'])
              ('page-layout-test-mac-os-x', PageLoadTestBuildFactory, ['apple-slave-1']),
+             ('post-commit-pixel-powerpc-mac-os-x', PixelTestBuildFactory, ['apple-slave-3', 'apple-slave-4'])
              ('post-commit-win32', Win32BuildFactory, ['apple-slave-2']),
-             ('periodic-powerpc-mac-os-x-no-svg', NoSVGBuildFactory, ['apple-slave-3', 'apple-slave-5', 'apple-slave-6']),
+             ('periodic-powerpc-mac-os-x-no-svg', NoSVGBuildFactory, ['apple-slave-4', 'apple-slave-3'])
              ]
 
 def getBuilders():
index 9cff6aa586b3b7fa95123b32f5a58e5046dc199f..cf7ee3bdaa95de32713da2fd8d61b68e54e6fc32 100644 (file)
@@ -21,7 +21,7 @@ allBuildsEmail = mail.MailNotifier(fromaddr="buildbot@webkit.org",
                                     sendToInterestedUsers=False)
 breakageEmail = mail.MailNotifier(fromaddr="buildbot@webkit.org",
                                   extraRecipients=["mark+webkit-builds@bdash.net.nz"],
-                                  sendToInterestedUsers=False,
+                                  lookup=mail.Domain("opensource.apple.com"),
                                   mode="breakage")
 
 IRC = words.IRC(host="irc.freenode.net",
index a1aa8c38ce028644996534a499ac0000ba82b278..df5474bfe41ef046b490f1d9f093dfb07a4d3214 100644 (file)
@@ -28,7 +28,7 @@ class LayoutTest(Test):
     def commandComplete(self, cmd):
         Test.commandComplete(self, cmd)
         
-        logText = cmd.log.getText()
+        logText = cmd.logs['stdio'].getText()
         incorrectLayoutLines = [line for line in logText.splitlines() if line.find('had incorrect layout') >= 0]
         if incorrectLayoutLines:
             self.incorrectLayoutLine = incorrectLayoutLines[0]
@@ -68,7 +68,7 @@ class LeakTest(Test):
     def commandComplete(self, cmd):
         Test.commandComplete(self, cmd)
 
-        logText = cmd.log.getText()
+        logText = cmd.logs['stdio'].getText()
         self.totalLeakLines = [line for line in logText.splitlines() if line.find('total leaks found!') >= 0]
         self.totalLeakLines += [line for line in logText.splitlines() if line.find('LEAK: ') >= 0]
         self.totalLeakLines = [' '.join(x.split()[1:]) for x in self.totalLeakLines]
@@ -132,8 +132,7 @@ class CompileWebKit(Compile):
 
 
 class CompileWebKitNoSVG(CompileWebKit):
-    command = CompileWebKit.command + ['--no-svg']
-
+    command = 'rm -rf WebKitBuild && ./WebKitTools/Scripts/build-webkit --no-svg'
 
 class InstallWin32Dependencies(ShellCommand):
     description = ["installing Windows dependencies"]
index 3140d6182b11c0318a44fe065d10b1aaf8f6e4bf..3a5c39a62f9b92d9f5b28d8b2d5201206f0e2cf9 100644 (file)
@@ -1,3 +1,14 @@
+2006-09-15  Mark Rowe  <opendarwin.org@bdash.net.nz>
+
+        Reviewed by Brady.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10635
+        Bug 10635: Buildbot configuration in SVN is out of sync with build.webkit.org
+
+        * BuildSlaveSupport/build.webkit.org-config/webkit/builders.py: Reorder build slaves within build factories in an attempt to spread the load evenly.
+        * BuildSlaveSupport/build.webkit.org-config/webkit/status.py: Return to sending status emails to <svnuser>@opensource.apple.com addresses.
+        * BuildSlaveSupport/build.webkit.org-config/webkit/steps.py: Update configuration to match changes in Buildbot.  Always do clean SVG builds.
+
 2006-09-09  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Eric.