Original author: dustin at v.igoro.us Date: 2008-06-13 22:57:34+00:00 Index: waterfall.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/waterfall.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- waterfall.py 27 May 2008 00:52:29 -0000 1.30 +++ waterfall.py 25 Jun 2008 23:52:26 -0000 1.31 @@ -530,7 +530,7 @@ data += "\n" - data += '

Update of /cvsroot/buildbot/buildbot/docs In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26386/docs Modified Files: buildbot.texinfo Log Message: [project @ fix-docs.patch] Fix my typos in the documentation, which were causing buildbot failures. Original author: dustin at v.igoro.us Date: 2008-06-25 18:05:23+00:00 Index: buildbot.texinfo =================================================================== RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v retrieving revision 1.150 retrieving revision 1.151 diff -u -d -r1.150 -r1.151 --- buildbot.texinfo 27 May 2008 00:52:29 -0000 1.150 +++ buildbot.texinfo 25 Jun 2008 23:52:31 -0000 1.151 @@ -1894,7 +1894,7 @@ user has been inactive on the channel), which might prompt the Problem Hassler logic to send them an email message instead. - at node Live Status Clients, , IRC Nicknames, Users + at node Live Status Clients @subsection Live Status Clients The Buildbot also offers a PB-based status client interface which can @@ -1905,7 +1905,7 @@ alternative way to deliver low-latency high-interruption messages to the developer (like ``hey, you broke the build''). - at node Build Properties, , Users, Concepts + at node Build Properties @section Build Properties @cindex Properties @@ -4929,7 +4929,6 @@ * TreeSize:: * PerlModuleTest:: * SetProperty:: -* Build Properties:: @end menu @node Configure, Compile, Simple ShellCommand Subclasses, Simple ShellCommand Subclasses @@ -4995,7 +4994,7 @@ aka 'KiB' or 'kibibytes') on the step's status text, and sets a build property named 'tree-size-KiB' with the same value. - at node PerlModuleTest, Build Properties, TreeSize, Simple ShellCommand Subclasses + at node PerlModuleTest @subsubsection PerlModuleTest @bsindex buildbot.steps.shell.PerlModuleTest @@ -5047,178 +5046,7 @@ Then @code{my_extract} will see @code{stdout="output1\noutput2\n"} and @code{stderr="error\n"}. - at node Build Properties - at subsubsection Build Properties - - at cindex build properties - -Each build has a set of ``Build Properties'', which can be used by its -BuildStep to modify their actions. For example, the SVN revision -number of the source code being built is available as a build -property, and a ShellCommand step could incorporate this number into a -command which create a numbered release tarball. - -Some build properties are set when the build starts, such as the -SourceStamp information. Other properties can be set by BuildSteps as -they run, for example the various Source steps will set the - at code{got_revision} property to the source revision that was actually -checked out (which can be useful when the SourceStamp in use merely -requested the ``latest revision'': @code{got_revision} will tell you -what was actually built). - - at itemize - at item buildername -Name of this builder - at item buildnumber -Number of this build (numbers are unique within the builder) - at item branch -Branch of the source being built, from the SourceStamp - at item revision -Revision of the source being built, from the SourceStamp, as a string - at item scheduler -The name of the scheduler that invoked this build - at item slavename -The name of the buildslave performing this build - at end itemize - -In custom BuildSteps, you can get and set the build properties with -the @code{getProperty}/@code{setProperty} methods. Each takes a string -for the name of the property, and returns or accepts an -arbitrary at footnote{Build properties are serialized along with the -build results, so they must be serializable. For this reason, the -value of any build property should be simple inert data: strings, -numbers, lists, tuples, and dictionaries. They should not contain -class instances.} object. For example: - - at example -class MakeTarball(ShellCommand): - def start(self): - self.setCommand(["tar", "czf", - "build-%s.tar.gz" % self.getProperty("revision"), - "source"]) - ShellCommand.start(self) - at end example - - at cindex WithProperties - -You can use build properties in ShellCommands by using the - at code{WithProperties} wrapper when setting the arguments of the -ShellCommand. This interpolates the named build properties into the -generated shell command. You can also use a @code{WithProperties} as -the @code{workdir=} argument: this allows the working directory for a -command to be varied for each build, depending upon various build -properties. - - at example -from buildbot.steps.shell import ShellCommand, WithProperties - -f.addStep(ShellCommand, - command=["tar", "czf", - WithProperties("build-%s.tar.gz", "revision"), - "source"]) - at end example - -If this BuildStep were used in a tree obtained from Subversion, it -would create a tarball with a name like @file{build-1234.tar.gz}. - -The @code{WithProperties} function does @code{printf}-style string -interpolation, using strings obtained by calling - at code{build.getProperty(propname)}. Note that for every @code{%s} (or - at code{%d}, etc), you must have exactly one additional argument to -indicate which build property you want to insert. - - -You can also use python dictionary-style string interpolation by using -the @code{%(propname)s} syntax. In this form, the property name goes -in the parentheses, and WithProperties takes @emph{no} additional -arguments: - - at example -f.addStep(ShellCommand, - command=["tar", "czf", - WithProperties("build-%(revision)s.tar.gz"), - "source"]) - at end example - -Don't forget the extra ``s'' after the closing parenthesis! This is -the cause of many confusing errors. Also note that you can only use -WithProperties in the list form of the command= definition. You cannot -currently use it in the (discouraged) @code{command="stuff"} -single-string form. However, you can use something like - at code{command=["/bin/sh", "-c", "stuff", WithProperties(stuff)]} to -use both shell expansion and WithProperties interpolation. - -Note that, like python, you can either do positional-argument -interpolation @emph{or} keyword-argument interpolation, not both. Thus -you cannot use a string like - at code{WithProperties("foo-%(revision)s-%s", "branch")}. - -At the moment, the only way to set build properties is by writing a -custom BuildStep. - - at heading Common Build Properties - -The following build properties are set when the build is started, and -are available to all steps. - - at table @code - at item branch - -This comes from the build's SourceStamp, and describes which branch is -being checked out. This will be @code{None} (which interpolates into - at code{WithProperties} as an empty string) if the build is on the -default branch, which is generally the trunk. Otherwise it will be a -string like ``branches/beta1.4''. The exact syntax depends upon the VC -system being used. - - at item revision - -This also comes from the SourceStamp, and is the revision of the -source code tree that was requested from the VC system. When a build -is requested of a specific revision (as is generally the case when the -build is triggered by Changes), this will contain the revision -specification. The syntax depends upon the VC system in use: for SVN -it is an integer, for Mercurial it is a short string, for Darcs it is -a rather large string, etc. - -If the ``force build'' button was pressed, the revision will be - at code{None}, which means to use the most recent revision available. -This is a ``trunk build''. This will be interpolated as an empty -string. - - at item got_revision - -This is set when a Source step checks out the source tree, and -provides the revision that was actually obtained from the VC system. -In general this should be the same as @code{revision}, except for -trunk builds, where @code{got_revision} indicates what revision was -current when the checkout was performed. This can be used to rebuild -the same source code later. - -Note that for some VC systems (Darcs in particular), the revision is a -large string containing newlines, and is not suitable for -interpolation into a filename. - - at item buildername - -This is a string that indicates which Builder the build was a part of. -The combination of buildername and buildnumber uniquely identify a -build. - - at item buildnumber - -Each build gets a number, scoped to the Builder (so the first build -performed on any given Builder will have a build number of 0). This -integer property contains the build's number. - - at item slavename - -This is a string which identifies which buildslave the build is -running on. - - at end table - - at node Python BuildSteps, Transferring Files, Simple ShellCommand Subclasses, Build Steps + at node Python BuildSteps @subsection Python BuildSteps Here are some BuildSteps that are specifcally useful for projects @@ -5229,7 +5057,7 @@ * PyFlakes:: @end menu - at node BuildEPYDoc, PyFlakes, Python BuildSteps, Python BuildSteps + at node BuildEPYDoc @subsubsection BuildEPYDoc @bsindex buildbot.steps.python.BuildEPYDoc @@ -7242,7 +7070,7 @@ message to the user who issued the command. Otherwise, the report will be sent to the channel. Available events to be notified are: - at table + at table @code @item started A build has started @item finished From warner at users.sourceforge.net Wed Jun 25 23:52:37 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Wed, 25 Jun 2008 23:52:37 +0000 Subject: [Buildbot-commits] buildbot/buildbot/status builder.py, 1.109, 1.110 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/status In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26397/buildbot/status Modified Files: builder.py Log Message: [project @ fix-buildstatus-upgrade.patch] Upgrading from version 2 to 3 of BuildStatus had an incorrect call to properties.update. Closes #295. Original author: dustin at v.igoro.us Date: 2008-06-25 20:10:10+00:00 Index: builder.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- builder.py 22 May 2008 22:12:57 -0000 1.109 +++ builder.py 25 Jun 2008 23:52:35 -0000 1.110 @@ -1237,7 +1237,7 @@ # in version 3, self.properties became a Properties object propdict = self.properties self.properties = Properties() - self.properties.update(propdict) + self.properties.update(propdict, "Upgrade from previous version") def upgradeLogfiles(self): # upgrade any LogFiles that need it. This must occur after we've been From warner at users.sourceforge.net Wed Jun 25 23:52:43 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Wed, 25 Jun 2008 23:52:43 +0000 Subject: [Buildbot-commits] buildbot/buildbot/status/web slaves.py,1.5,1.6 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/status/web In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26409/buildbot/status/web Modified Files: slaves.py Log Message: [project @ #278:enhancedBuildSlavesPage-v2.diff] short patch by Ben Hearsum to make the /buildslaves WebStatus? page a little more useful. It does do things: 1) bolds the 'slave is NOT connected' line to make it more visible 2) shows whether each slave is busy (building) or not Original author: dustin at v.igoro.us Date: 2008-06-01 17:34:09+00:00 Index: slaves.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/slaves.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- slaves.py 16 Oct 2007 16:34:26 -0000 1.5 +++ slaves.py 25 Jun 2008 23:52:41 -0000 1.6 @@ -28,6 +28,8 @@ data += "

%s:\n" % name data += "
- Last heard from: %s " % age data += '(%s)' % lt data += "
- Slave is currently building.
- Slave is idle.
- Slave is NOT currently connected
- Slave is NOT currently connected
\n" data += "

Update of /cvsroot/buildbot/buildbot/buildbot/test In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26409/buildbot/test Modified Files: test_slaves.py Log Message: [project @ #278:enhancedBuildSlavesPage-v2.diff] short patch by Ben Hearsum to make the /buildslaves WebStatus? page a little more useful. It does do things: 1) bolds the 'slave is NOT connected' line to make it more visible 2) shows whether each slave is busy (building) or not Original author: dustin at v.igoro.us Date: 2008-06-01 17:34:09+00:00 Index: test_slaves.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_slaves.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- test_slaves.py 5 Feb 2008 21:05:34 -0000 1.16 +++ test_slaves.py 25 Jun 2008 23:52:41 -0000 1.17 @@ -26,6 +26,8 @@ f1 = factory.BuildFactory([s(dummy.RemoteDummy, timeout=1)]) f2 = factory.BuildFactory([s(dummy.RemoteDummy, timeout=2)]) +f3 = factory.BuildFactory([s(dummy.RemoteDummy, timeout=3)]) +f4 = factory.BuildFactory([s(dummy.RemoteDummy, timeout=5)]) c['builders'] = [ {'name': 'b1', 'slavenames': ['bot1','bot2','bot3'], @@ -42,6 +44,15 @@ """ +config_busyness = config_1 + """ +c['builders'] = [ + {'name': 'b1', 'slavenames': ['bot1'], + 'builddir': 'b1', 'factory': f3}, + {'name': 'b2', 'slavenames': ['bot1'], + 'builddir': 'b2', 'factory': f4}, + ] +""" + class Slave(RunMixin, unittest.TestCase): def setUp(self): @@ -189,6 +200,84 @@ def _testDontClaimPingingSlave_3(self, res): self.failUnlessEqual(res.getSlavename(), "bot1") + +class SlaveBusyness(RunMixin, unittest.TestCase): + + def setUp(self): + RunMixin.setUp(self) + self.master.loadConfig(config_busyness) + self.master.startService() + d = self.connectSlave(["b1", "b2"]) + return d + + def doBuild(self, buildername): + br = BuildRequest("forced", SourceStamp()) + d = br.waitUntilFinished() + self.control.getBuilder(buildername).requestBuild(br) + return d + + def getRunningBuilds(self): + return len(self.status.getSlave("bot1").getRunningBuilds()) + + def testSlaveNotBusy(self): + self.failUnlessEqual(self.getRunningBuilds(), 0) + # now kick a build, wait for it to finish, then check again + d = self.doBuild("b1") + d.addCallback(self._testSlaveNotBusy_1) + return d + + def _testSlaveNotBusy_1(self, res): + self.failUnlessEqual(self.getRunningBuilds(), 0) + + def testSlaveBusyOneBuild(self): + d1 = self.doBuild("b1") + d2 = defer.Deferred() + reactor.callLater(.5, d2.callback, None) + d2.addCallback(self._testSlaveBusyOneBuild_1) + d1.addCallback(self._testSlaveBusyOneBuild_finished_1) + return defer.DeferredList([d1,d2]) + + def _testSlaveBusyOneBuild_1(self, res): + self.failUnlessEqual(self.getRunningBuilds(), 1) + + def _testSlaveBusyOneBuild_finished_1(self, res): + self.failUnlessEqual(self.getRunningBuilds(), 0) + + def testSlaveBusyTwoBuilds(self): + d1 = self.doBuild("b1") + d2 = self.doBuild("b2") + d3 = defer.Deferred() + reactor.callLater(.5, d3.callback, None) + d3.addCallback(self._testSlaveBusyTwoBuilds_1) + d1.addCallback(self._testSlaveBusyTwoBuilds_finished_1, d2) + return defer.DeferredList([d1,d3]) + + def _testSlaveBusyTwoBuilds_1(self, res): + self.failUnlessEqual(self.getRunningBuilds(), 2) + + def _testSlaveBusyTwoBuilds_finished_1(self, res, d2): + self.failUnlessEqual(self.getRunningBuilds(), 1) + d2.addCallback(self._testSlaveBusyTwoBuilds_finished_2) + return d2 + + def _testSlaveBusyTwoBuilds_finished_2(self, res): + self.failUnlessEqual(self.getRunningBuilds(), 0) + + def testSlaveDisconnect(self): + d1 = self.doBuild("b1") + d2 = defer.Deferred() + reactor.callLater(.5, d2.callback, None) + d2.addCallback(self._testSlaveDisconnect_1) + d1.addCallback(self._testSlaveDisconnect_finished_1) + return defer.DeferredList([d1, d2]) + + def _testSlaveDisconnect_1(self, res): + self.failUnlessEqual(self.getRunningBuilds(), 1) + return self.shutdownAllSlaves() + + def _testSlaveDisconnect_finished_1(self, res): + self.failUnlessEqual(self.getRunningBuilds(), 0) + config_3 = """ from buildbot.process import factory from buildbot.steps import dummy From warner at users.sourceforge.net Wed Jun 25 23:52:42 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Wed, 25 Jun 2008 23:52:42 +0000 Subject: [Buildbot-commits] buildbot/buildbot buildslave.py,1.11,1.12 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26409/buildbot Modified Files: buildslave.py Log Message: [project @ #278:enhancedBuildSlavesPage-v2.diff] short patch by Ben Hearsum to make the /buildslaves WebStatus? page a little more useful. It does do things: 1) bolds the 'slave is NOT connected' line to make it more visible 2) shows whether each slave is busy (building) or not Original author: dustin at v.igoro.us Date: 2008-06-01 17:34:09+00:00 Index: buildslave.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/buildslave.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- buildslave.py 22 May 2008 22:13:06 -0000 1.11 +++ buildslave.py 25 Jun 2008 23:52:40 -0000 1.12 @@ -96,6 +96,12 @@ return self.sendBuilderList() return defer.succeed(None) + def updateSlaveStatus(self, buildStarted=None, buildFinished=None): + if buildStarted: + self.slave_status.buildStarted(buildStarted) + if buildFinished: + self.slave_status.buildFinished(buildFinished) + def attached(self, bot): """This is called when the slave connects. From warner at users.sourceforge.net Wed Jun 25 23:52:43 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Wed, 25 Jun 2008 23:52:43 +0000 Subject: [Buildbot-commits] buildbot/buildbot/process base.py,1.84,1.85 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/process In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26409/buildbot/process Modified Files: base.py Log Message: [project @ #278:enhancedBuildSlavesPage-v2.diff] short patch by Ben Hearsum to make the /buildslaves WebStatus? page a little more useful. It does do things: 1) bolds the 'slave is NOT connected' line to make it more visible 2) shows whether each slave is busy (building) or not Original author: dustin at v.igoro.us Date: 2008-06-01 17:34:09+00:00 Index: base.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- base.py 22 May 2008 22:13:22 -0000 1.84 +++ base.py 25 Jun 2008 23:52:40 -0000 1.85 @@ -309,6 +309,7 @@ # now that we have a build_status, we can set properties self.setupProperties() self.setupSlaveBuilder(slavebuilder) + slavebuilder.slave.updateSlaveStatus(buildStarted=build_status) # convert all locks into their real forms self.locks = [self.builder.botmaster.getLockByID(l) @@ -318,10 +319,11 @@ self.remote = slavebuilder.remote self.remote.notifyOnDisconnect(self.lostRemote) d = self.deferred = defer.Deferred() - def _release_slave(res): + def _release_slave(res, slave, bs): self.slavebuilder.buildFinished() + slave.updateSlaveStatus(buildFinished=bs) return res - d.addCallback(_release_slave) + d.addCallback(_release_slave, self.slavebuilder.slave, build_status) try: self.setupBuild(expectations) # create .steps From warner at users.sourceforge.net Wed Jun 25 23:52:43 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Wed, 25 Jun 2008 23:52:43 +0000 Subject: [Buildbot-commits] buildbot/buildbot/status builder.py, 1.110, 1.111 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/status In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26409/buildbot/status Modified Files: builder.py Log Message: [project @ #278:enhancedBuildSlavesPage-v2.diff] short patch by Ben Hearsum to make the /buildslaves WebStatus? page a little more useful. It does do things: 1) bolds the 'slave is NOT connected' line to make it more visible 2) shows whether each slave is busy (building) or not Original author: dustin at v.igoro.us Date: 2008-06-01 17:34:09+00:00 Index: builder.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- builder.py 25 Jun 2008 23:52:35 -0000 1.110 +++ builder.py 25 Jun 2008 23:52:41 -0000 1.111 @@ -1743,6 +1743,7 @@ def __init__(self, name): self.name = name self._lastMessageReceived = 0 + self.runningBuilds = [] def getName(self): return self.name @@ -1754,6 +1755,8 @@ return self.connected def lastMessageReceived(self): return self._lastMessageReceived + def getRunningBuilds(self): + return self.runningBuilds def setAdmin(self, admin): self.admin = admin @@ -1764,6 +1767,11 @@ def setLastMessageReceived(self, when): self._lastMessageReceived = when + def buildStarted(self, build): + self.runningBuilds.append(build) + def buildFinished(self, build): + self.runningBuilds.remove(build) + class Status: """ I represent the status of the buildmaster. From warner at users.sourceforge.net Wed Jun 25 23:52:47 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Wed, 25 Jun 2008 23:52:47 +0000 Subject: [Buildbot-commits] buildbot/buildbot/status/web grid.py,1.2,1.3 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/status/web In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26451/buildbot/status/web Modified Files: grid.py Log Message: [project @ #300:sort-grid.patch] Sort the builders in the grid display Original author: dustin at v.igoro.us Date: 2008-06-13 20:01:41+00:00 Index: grid.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/grid.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- grid.py 22 May 2008 22:11:29 -0000 1.2 +++ grid.py 25 Jun 2008 23:52:45 -0000 1.3 @@ -179,7 +179,9 @@ data += self.stamp_td(stamp) data += '\n' - for bn in status.getBuilderNames(): + sortedBuilderNames = status.getBuilderNames()[:] + sortedBuilderNames.sort() + for bn in sortedBuilderNames: builds = [None] * len(stamps) builder = status.getBuilder(bn) From warner at users.sourceforge.net Wed Jun 25 23:52:51 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Wed, 25 Jun 2008 23:52:51 +0000 Subject: [Buildbot-commits] buildbot setup.py,1.50,1.51 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26463 Modified Files: setup.py Log Message: [project @ setup-extra-space.patch] Remove typo (extra space after 'scripts') in setup.py Original author: dustin at v.igoro.us Date: 2008-06-22 17:12:03+00:00 Index: setup.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/setup.py,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- setup.py 24 Apr 2008 22:50:03 -0000 1.50 +++ setup.py 25 Jun 2008 23:52:49 -0000 1.51 @@ -85,7 +85,7 @@ ("buildbot/test/mail", testmsgs), ("buildbot/test/subdir", ["buildbot/test/subdir/emit.py"]), ], - 'scripts ': scripts, + 'scripts': scripts, 'cmdclass': {'install_data': install_data_twisted}, } From warner at users.sourceforge.net Thu Jun 26 03:52:22 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Thu, 26 Jun 2008 03:52:22 +0000 Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.151,1.152 Message-ID: Update of /cvsroot/buildbot/buildbot/docs In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21357/docs Modified Files: buildbot.texinfo Log Message: [project @ #305:stepinstances.diff] Patch by Albert Hofkamp to use step instances universally in the documentation. Original author: dustin at zmanda.com Date: 2008-06-26 03:35:41+00:00 Index: buildbot.texinfo =================================================================== RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v retrieving revision 1.151 retrieving revision 1.152 diff -u -d -r1.151 -r1.152 --- buildbot.texinfo 25 Jun 2008 23:52:31 -0000 1.151 +++ buildbot.texinfo 26 Jun 2008 03:52:19 -0000 1.152 @@ -4147,10 +4147,10 @@ from buildbot.steps.shell import ShellCommand from buildbot.process.properties import WithProperties -f.addStep(ShellCommand, +f.addStep(ShellCommand( command=["tar", "czf", WithProperties("build-%s.tar.gz", "revision"), - "source"]) + "source"])) @end example If this BuildStep were used in a tree obtained from Subversion, it @@ -4168,10 +4168,10 @@ arguments: @example -f.addStep(ShellCommand, +f.addStep(ShellCommand( command=["tar", "czf", WithProperties("build-%(revision)s.tar.gz"), - "source"]) + "source"])) @end example Don't forget the extra ``s'' after the closing parenthesis! This is @@ -4832,8 +4832,8 @@ language setting, you might use @example -f.addStep(ShellCommand, command=["make", "test"], - env=@{'LANG': 'fr_FR'@}) +f.addStep(ShellCommand(command=["make", "test"], + env=@{'LANG': 'fr_FR'@})) @end example These variable settings will override any existing ones in the @@ -4846,9 +4846,10 @@ following: @example -f.addStep(ShellCommand, command=["make", "test"], - env=@{'PYTHONPATH': ["/usr/local/lib/python2.3", - "/home/buildbot/lib/python"] @}) +f.addStep(ShellCommand( + command=["make", "test"], + env=@{'PYTHONPATH': ["/usr/local/lib/python2.3", + "/home/buildbot/lib/python"] @})) @end example @item want_stdout @@ -4878,8 +4879,9 @@ the build runs, and any new text will be sent over to the buildmaster. @example -f.addStep(ShellCommand, command=["make", "test"], - logfiles=@{"triallog": "_trial_temp/test.log"@}) +f.addStep(ShellCommand( + command=["make", "test"], + logfiles=@{"triallog": "_trial_temp/test.log"@})) @end example @@ -4907,9 +4909,9 @@ display. @example -f.addStep(ShellCommand, command=["make", "test"], - description=["testing"], - descriptionDone=["tests"]) +f.addStep(ShellCommand(command=["make", "test"], + description=["testing"], + descriptionDone=["tests"])) @end example @end table @@ -5091,7 +5093,7 @@ from buildbot.steps.python import BuildEPYDoc ... -f.addStep(BuildEPYDoc, command=["epydoc", "-o", "apiref", "source/mypkg"]) +f.addStep(BuildEPYDoc(command=["epydoc", "-o", "apiref", "source/mypkg"])) @end example @@ -5118,7 +5120,7 @@ from buildbot.steps.python import PyFlakes ... -f.addStep(PyFlakes, command=["pyflakes", "src"]) +f.addStep(PyFlakes(command=["pyflakes", "src"])) @end example @@ -5150,10 +5152,9 @@ from buildbot.steps.shell import ShellCommand from buildbot.steps.transfer import FileUpload -f.addStep(ShellCommand, command=["make", "docs"]) -f.addStep(FileUpload, - slavesrc="docs/reference.html", - masterdest="~/public_html/ref.html") +f.addStep(ShellCommand(command=["make", "docs"])) +f.addStep(FileUpload(slavesrc="docs/reference.html", + masterdest="~/public_html/ref.html")) @end example The @code{masterdest=} argument will be passed to os.path.expanduser, @@ -5173,10 +5174,9 @@ from buildbot.steps.shell import ShellCommand from buildbot.steps.transfer import FileUpload -f.addStep(FileDownload - mastersrc="~/todays_build_config.txt", - slavedest="build_config.txt") -f.addStep(ShellCommand, command=["make", "config"]) +f.addStep(FileDownload(mastersrc="~/todays_build_config.txt", + slavedest="build_config.txt")) +f.addStep(ShellCommand(command=["make", "config"])) @end example Like @code{FileUpload}, the @code{mastersrc=} argument is interpreted @@ -5219,9 +5219,9 @@ @example from buildbot.steps.trigger import Trigger -f.addStep(Trigger, schedulerNames=['build-prep'], - waitForFinish=True, - updateSourceStamp=True) +f.addStep(Trigger(schedulerNames=['build-prep'], + waitForFinish=True, + updateSourceStamp=True)) @end example The @code{schedulerNames=} argument lists the Triggerables