[Buildbot-commits] buildbot/docs/examples twisted_master.cfg,1.39,1.40

[Brian Warner]

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

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

update twisted_master.cfg

	* docs/examples/twisted_master.cfg: update to match the Twisted
	buildbot: remove python2.2, switch to exarkun's buildslaves,
	disable the .deb builder until we figure out how to build twisted
	.debs from SVN, add some ktrace debugging to the OS-X build
	process and remove the qt build, remove threadless builders,
	change freebsd builder to use landonf's buildslave.


Index: twisted_master.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/twisted_master.cfg,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- twisted_master.cfg	22 Dec 2005 21:00:01 -0000	1.39
+++ twisted_master.cfg	19 Jan 2006 01:32:58 -0000	1.40
@@ -76,29 +76,21 @@
 
 builders = []
 
+
 b1 = {'name': "quick",
       'slavename': "bot1",
       'builddir': "quick",
       'factory': QuickTwistedBuildFactory(source_update,
-                                          python=["python2.2", "python2.3"]),
+                                          python=["python2.3", "python2.4"]),
       }
 builders.append(b1)
 
-b22 = {'name': "full-2.2",
-       'slavename': "bot-exarkun",
-       'builddir': "full2.2",
-       'factory': FullTwistedBuildFactory(source_copy,
-                                          python="python2.2",
-                                          processDocs=0),
-       }
-builders.append(b22)
-
 b23compile_opts = [
     "-Wignore::PendingDeprecationWarning:distutils.command.build_py",
     "-Wignore::PendingDeprecationWarning:distutils.command.build_ext",
     ]
 b23 = {'name': "full-2.3",
-       'slavename': "bot1",
+       'slavename': "bot-exarkun-boson",
        'builddir': "full2.3",
        'factory': FullTwistedBuildFactory(source_copy,
                                           python=["python2.3", "-Wall"],
@@ -114,7 +106,7 @@
     "-Wignore::PendingDeprecationWarning:distutils.command.build_ext",
     ]
 b24 = {'name': "full-2.4",
-       'slavename': "bot-exarkun",
+       'slavenames': ["bot-exarkun"],
        'builddir': "full2.4",
        'factory': FullTwistedBuildFactory(source_copy,
                                           python=["python2.4", "-Wall"],
@@ -124,14 +116,14 @@
        }
 builders.append(b24)
 
-b3 = {'name': "debuild",
-      'slavename': "bot2",
-      'builddir': "debuild",
-      'factory': TwistedDebsBuildFactory(source_export,
-                                         python="python2.2"),
-      }
 # debuild is offline while we figure out how to build 2.0 .debs from SVN
-#builders.append(b3)
+# b3 = {'name': "debuild",
+#       'slavename': "bot2",
+#       'builddir': "debuild",
+#       'factory': TwistedDebsBuildFactory(source_export,
+#                                          python="python2.4"),
+#       }
+# builders.append(b3)
 
 reactors = ['gtk2', 'gtk', 'qt', 'poll']
 b4 = {'name': "reactors",
@@ -143,20 +135,20 @@
       }
 builders.append(b4)
 
-
-b23osx = {'name': "OS-X",
+jf = TwistedReactorsBuildFactory(source_copy,
+                                 python="python2.4", reactors=["default"])
+jf.steps.insert(0, s(step.ShellCommand, workdir=".",
+                                   command=["ktrace", "rm", "-rf", "Twisted"]))
+b24osx = {'name': "OS-X",
           'slavename': "bot-jerub",
           'builddir': "OSX-full2.4",
-          'factory': TwistedReactorsBuildFactory(source_copy,
-                                                 python="python2.4",
-                                                 reactors=["default",
-                                                           "qt",
-                                                           # "cf",
-                                                           # "threadedselect",
-                                                          ],
-                                                 ),
+#          'factory': TwistedReactorsBuildFactory(source_copy,
+#                                                 python="python2.4",
+#                                                 reactors=["default"],
+#                                                 ),
+           'factory': jf,
           }
-builders.append(b23osx)
+builders.append(b24osx)
 
 b24w32_select = {
           'name': "win32-select",
@@ -194,24 +186,25 @@
 builders.append(b24w32_iocp)
 
 
-b23bsd = {'name': "freebsd",
-          'slavename': "bot-suszko",
-          'builddir': "bsd-full2.2",
-          'factory': TwistedReactorsBuildFactory(source_copy,
-                                                 python="python2.3",
-                                                 reactors=["default",
-                                                           "kqueue",
-                                                           ]),
-          }
-#builders.append(b23bsd)
+b23freebsd = {'name': "freebsd",
+              'slavename': "bot-landonf",
+              'builddir': "freebsd-full2.3",
+              'factory':
+              TwistedReactorsBuildFactory(source_copy,
+                                          python="python2.3",
+                                          reactors=["default",
+                                                    "kqueue",
+                                                    ]),
+              }
+builders.append(b23freebsd)
 
-b24threadless = {'name': 'threadless',
-                 'slavename': 'bot-threadless',
-                 'builddir': 'debian-threadless-2.4',
-                 'factory': TwistedReactorsBuildFactory(source_copy,
-                                                        python='python',
-                                                        reactors=['default'])}
-#builders.append(b24threadless)
+# b24threadless = {'name': 'threadless',
+#                  'slavename': 'bot-threadless',
+#                  'builddir': 'debian-threadless-2.4',
+#                  'factory': TwistedReactorsBuildFactory(source_copy,
+#                                                         python='python',
+#                                                         reactors=['default'])}
+# builders.append(b24threadless)
 
 c['builders'] = builders