Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (101662 => 101663)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-12-01 13:36:39 UTC (rev 101662)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-12-01 13:45:54 UTC (rev 101663)
@@ -1,8 +1,6 @@
# -*- python -*-
# ex: set syntax=python:
-c = BuildmasterConfig = {}
-
from buildbot.buildslave import BuildSlave
from buildbot.changes.pb import PBChangeSource
from buildbot.scheduler import AnyBranchScheduler, Triggerable
@@ -23,8 +21,41 @@
from webkitpy.common.config import build as wkbuild
from webkitpy.common.net.buildbot import BuildBot as wkbuildbot
+
+c = BuildmasterConfig = {}
+
+c['change_source'] = PBChangeSource()
+
+# permissions for WebStatus
+authz = Authz(
+ forceBuild=False,
+ forceAllBuilds=False,
+ pingBuilder=True,
+ gracefulShutdown=False,
+ stopBuild=True,
+ stopAllBuilds=True,
+ cancelPendingBuild=True,
+ stopChange=True,
+ cleanShutdown=False)
+
+c['status'] = []
+c['status'].append(html.WebStatus(http_port=8710,
+ revlink="http://trac.webkit.org/changeset/%s",
+ authz=authz))
+
+c['slavePortnum'] = 17000
+c['projectName'] = "WebKit"
+c['projectURL'] = "http://webkit.org"
+c['buildbotURL'] = "http://build.webkit.org/"
+
+c['buildHorizon'] = 1000
+c['logHorizon'] = 500
+c['eventHorizon'] = 200
+c['buildCacheSize'] = 60
+
WithProperties = properties.WithProperties
+
class ConfigureBuild(buildstep.BuildStep):
name = "configure build"
description = ["configuring build"]
@@ -773,32 +804,3 @@
c['builders'].append(builder)
loadBuilderConfig(c)
-
-c['change_source'] = PBChangeSource()
-
-# permissions for WebStatus
-authz = Authz(
- forceBuild=False,
- forceAllBuilds=False,
- pingBuilder=True,
- gracefulShutdown=False,
- stopBuild=True,
- stopAllBuilds=True,
- cancelPendingBuild=True,
- stopChange=True,
- cleanShutdown=False)
-
-c['status'] = []
-c['status'].append(html.WebStatus(http_port=8710,
- revlink="http://trac.webkit.org/changeset/%s",
- authz=authz))
-
-c['slavePortnum'] = 17000
-c['projectName'] = "WebKit"
-c['projectURL'] = "http://webkit.org"
-c['buildbotURL'] = "http://build.webkit.org/"
-
-c['buildHorizon'] = 1000
-c['logHorizon'] = 500
-c['eventHorizon'] = 200
-c['buildCacheSize'] = 60
Modified: trunk/Tools/ChangeLog (101662 => 101663)
--- trunk/Tools/ChangeLog 2011-12-01 13:36:39 UTC (rev 101662)
+++ trunk/Tools/ChangeLog 2011-12-01 13:45:54 UTC (rev 101663)
@@ -1,3 +1,11 @@
+2011-12-01 Adam Roben <[email protected]>
+
+ Buildbot fix
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg: Moved all of the initialization of
+ BuildmasterConfig not performed by loadBuilderConfig up to the top of the file. This makes
+ it possible for build steps to reference things like the buildbotURL property of the config.
+
2011-11-30 Adam Roben <[email protected]>
Use curl for downloading builds to test slaves
