[Buildbot-commits] buildbot/docs/examples twisted_master.cfg,1.26,1.27

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/docs/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv911/docs/examples

Modified Files:
	twisted_master.cfg 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-230
Creator:  Brian Warner <warner at monolith.lothar.com>

fix buildbot.texinfo so it can produce an HTML manual

	* docs/examples/twisted_master.cfg: update to match current usage

	* docs/buildbot.texinfo (System Architecture): comment out the
	image, it doesn't exist yet and just screws up the HTML manual.


Index: twisted_master.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/twisted_master.cfg,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- twisted_master.cfg	4 Dec 2004 22:16:59 -0000	1.26
+++ twisted_master.cfg	7 Jul 2005 08:09:12 -0000	1.27
@@ -6,6 +6,9 @@
 # http://www.twistedmatrix.com/buildbot/ . Passwords and other secret
 # information are loaded from a neighboring file called 'private.py'.
 
+import sys
+sys.path.append('/home/buildbot/BuildBot/support-master')
+
 import os.path
 
 from buildbot import master
@@ -22,13 +25,14 @@
 import private # holds passwords
 reload(private) # make it possible to change the contents without a restart
 
+BuildmasterConfig = c = {}
+
 # I set really=False when testing this configuration at home
 really = True
 useFreshCVS = False
 useMaildir = False
 usePBChangeSource = True
 
-c = {}
 
 c['bots'] = []
 for bot in private.bot_passwords.keys():
@@ -80,14 +84,12 @@
       }
 builders.append(b1)
 
-f22 = FullTwistedBuildFactory(svnurl,
-                              python="python2.2", processDocs=1)
 b22 = {'name': "full-2.2",
        'slavename': "bot-exarkun",
        'builddir': "full2.2",
        'factory': FullTwistedBuildFactory(svnurl,
                                           python="python2.2",
-                                          processDocs=1),
+                                          processDocs=0),
        }
 builders.append(b22)
 
@@ -102,6 +104,7 @@
                                           python=["python2.3", "-Wall"],
                                           # use -Werror soon
                                           compileOpts=b23compile_opts,
+                                          processDocs=1,
                                           runTestsRandomly=1),
        }
 builders.append(b23)
@@ -127,7 +130,8 @@
       'factory': TwistedDebsBuildFactory(svnurl,
                                          python="python2.2"),
       }
-builders.append(b3)
+# debuild is offline while we figure out how to build 2.0 .debs from SVN
+#builders.append(b3)
 
 reactors = ['gtk2', 'gtk', 'qt', 'poll']
 b4 = {'name': "reactors",
@@ -139,12 +143,14 @@
       }
 builders.append(b4)
 
+
 b23osx = {'name': "OS-X",
-          'slavename': "bot-OSX",
-          'builddir': "OSX-full2.3",
+          'slavename': "bot-jerub",
+          'builddir': "OSX-full2.4",
           'factory': TwistedReactorsBuildFactory(svnurl,
-                                                 python="python2.3",
-                                                 reactors=["default", "cf"],
+                                                 python="python2.4",
+                                                 reactors=["default", #"cf",
+                                                           "threadedselect"],
                                                  ),
           }
 builders.append(b23osx)
@@ -157,6 +163,7 @@
                                                  compileOpts2=["-c","mingw32"],
                                                  reactors=["default",
                                                            "iocp",
+                                                           "win32",
                                                            ]),
           }
 builders.append(b22w32)
@@ -172,14 +179,13 @@
           }
 builders.append(b23bsd)
 
-b23netbsd = {'name': "netbsd",
-             'slavename': "bot-netbsd",
-             'builddir': "netbsd-full2.3",
-             'factory': TwistedReactorsBuildFactory(svnurl,
-                                                    python="python2.3",
-                                                    reactors=["default"]),
-             }
-builders.append(b23netbsd)
+b24threadless = {'name': 'threadless',
+                 'slavename': 'bot-threadless',
+                 'builddir': 'debian-threadless-2.4',
+                 'factory': TwistedReactorsBuildFactory(svnurl,
+                                                        python='python',
+                                                        reactors=['default'])}
+builders.append(b24threadless)
 
 c['builders'] = builders
 
@@ -199,12 +205,11 @@
                                  channels=["twisted"]))
 
 c['debugPassword'] = private.debugPassword
-c['interlocks'] = [("do-deb", ["full-2.2"], ["debuild"])]
+#c['interlocks'] = [("do-deb", ["full-2.2"], ["debuild"])]
 if hasattr(private, "manhole"):
     c['manhole'] = master.Manhole(*private.manhole)
 c['status'].append(client.PBListener(9936))
 m = mail.MailNotifier(fromaddr="buildbot at twistedmatrix.com",
-                      #builders=["quick", "full-2.2", "full-2.3", "full-2.4"],
                       builders=["quick", "full-2.3"],
                       sendToInterestedUsers=True,
 		      extraRecipients=["warner at lothar.com"],
@@ -214,7 +219,3 @@
 c['projectName'] = "Twisted"
 c['projectURL'] = "http://twistedmatrix.com/"
 c['buildbotURL'] = "http://twistedmatrix.com/buildbot/"
-
-# TODO?: services = ["change", "status"]
-
-BuildmasterConfig = c