[Buildbot-commits] buildbot/buildbot/scripts sample.cfg,1.9,1.10

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/scripts
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3223/buildbot/scripts

Modified Files:
	sample.cfg 
Log Message:
[project @ rearrange sample.cfg into major sections, update manhole example]

Original author: warner at lothar.com
Date: 2006-07-16 03:31:00

Index: sample.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/sample.cfg,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sample.cfg	29 May 2006 00:10:26 -0000	1.9
+++ sample.cfg	16 Jul 2006 03:34:05 -0000	1.10
@@ -9,23 +9,27 @@
 # dictionary has a variety of keys to control different aspects of the
 # buildmaster. They are documented in docs/config.xhtml .
 
-import os.path
-from buildbot.changes.freshcvs import FreshCVSSource
-from buildbot.scheduler import Scheduler
-from buildbot.process import step, factory
-from buildbot.status import html
-s = factory.s
 
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
+####### BUILDSLAVES
+
 # the 'bots' list defines the set of allowable buildslaves. Each element is a
 # tuple of bot-name and bot-password. These correspond to values given to the
 # buildslave's mktap invocation.
 c['bots'] = [("bot1name", "bot1passwd")]
 
 
+# 'slavePortnum' defines the TCP port to listen on. This must match the value
+# configured into the buildslaves (with their --master option)
+
+c['slavePortnum'] = 9989
+
+
+####### CHANGESOURCES
+
 # the 'sources' list tells the buildmaster how it should find out about
 # source code changes. Any class which implements IChangeSource can be added
 # to this list: there are several in buildbot/changes/*.py to choose from.
@@ -41,6 +45,7 @@
 # then you could use the following buildmaster Change Source to subscribe to
 # the FreshCVS daemon and be notified on every commit:
 #
+#from buildbot.changes.freshcvs import FreshCVSSource
 #fc_source = FreshCVSSource("cvs.example.com", 4519, "foo", "bar")
 #c['sources'].append(fc_source)
 
@@ -52,14 +57,18 @@
 #c['sources'].append(PBChangeSource())
 
 
+####### SCHEDULERS
+
 ## configure the Schedulers
 
+from buildbot.scheduler import Scheduler
 c['schedulers'] = []
 c['schedulers'].append(Scheduler(name="all", branch=None,
                                  treeStableTimer=2*60,
                                  builderNames=["buildbot-full"]))
 
 
+####### BUILDERS
 
 # the 'builders' list defines the Builders. Each one is configured with a
 # dictionary, using the following keys:
@@ -84,6 +93,8 @@
 
 builders = []
 
+from buildbot.process import step, factory
+s = factory.s
 source = s(step.CVS, cvsroot=cvsroot, cvsmodule=cvsmodule, login="",
            mode="copy")
 f1 = factory.Trial(source, tests="buildbot.test",
@@ -97,16 +108,16 @@
       }
 c['builders'] = [b1]
 
-# 'slavePortnum' defines the TCP port to listen on. This must match the value
-# configured into the buildslaves (with their --master option)
 
-c['slavePortnum'] = 9989
+####### STATUS TARGETS
 
 # 'status' is a list of Status Targets. The results of each build will be
 # pushed to these targets. buildbot/status/*.py has a variety to choose from,
 # including web pages, email senders, and IRC bots.
 
 c['status'] = []
+
+from buildbot.status import html
 c['status'].append(html.Waterfall(http_port=8010))
 
 # from buildbot.status import mail
@@ -118,6 +129,8 @@
 #                              channels=["#example"]))
 
 
+####### DEBUGGING OPTIONS
+
 # if you set 'debugPassword', then you can connect to the buildmaster with
 # the diagnostic tool in contrib/debugclient.py . From this tool, you can
 # manually force builds and inject changes, which may be useful for testing
@@ -125,13 +138,18 @@
 # before you have a functioning 'sources' set up). The debug tool uses the
 # same port number as the slaves do: 'slavePortnum'.
 
-c['debugPassword'] = "debugpassword"
+#c['debugPassword'] = "debugpassword"
 
-# if you set 'manhole', you can telnet into the buildmaster and get an
+# if you set 'manhole', you can ssh into the buildmaster and get an
 # interactive python shell, which may be useful for debugging buildbot
-# internals. It is probably only useful for buildbot developers.
-#from buildbot.master import Manhole
-#c['manhole'] = Manhole("tcp:9999:interface=127.0.0.1", "admin", "password")
+# internals. It is probably only useful for buildbot developers. You can also
+# use an authorized_keys file, or plain telnet.
+#from buildbot import manhole
+#c['manhole'] = manhole.PasswordManhole("tcp:9999:interface=127.0.0.1",
+#                                       "admin", "password")
+
+
+####### PROJECT IDENTITY
 
 # the 'projectName' string will be used to describe the project that this
 # buildbot is working on. For example, it is used as the title of the