[Buildbot-commits] buildbot/docs/examples twisted_master.cfg,1.31,1.32

[Brian Warner]

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

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

enable build-on-branch for the Twisted buildbot

	* buildbot/process/process_twisted.py: rework all BuildFactory
	classes to take a 'source' step as an argument, instead of
	building up the SVN instance in the factory.
	* docs/examples/twisted_master.cfg: enable build-on-branch by
	providing a base_url and default_branch


Index: twisted_master.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/twisted_master.cfg,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- twisted_master.cfg	20 Oct 2005 22:32:48 -0000	1.31
+++ twisted_master.cfg	21 Oct 2005 08:14:52 -0000	1.32
@@ -85,13 +85,26 @@
 ## configure the builders
 
 svnurl = "svn://svn.twistedmatrix.com/svn/Twisted/trunk"
+# for build-on-branch, we use these instead
+base_url = "svn://svn.twistedmatrix.com/svn/Twisted/"
+default_branch = "trunk"
+#source_update = s(step.SVN, svnurl=svnurl, mode="update")
+#source_copy = s(step.SVN, svnurl=svnurl, mode="copy")
+#source_export = s(step.SVN, svnurl=svnurl, mode="export")
+source_update = s(step.SVN, base_url=base_url, default_branch=default_branch,
+                  mode="update")
+source_copy = s(step.SVN, base_url=base_url, default_branch=default_branch,
+                mode="copy")
+source_export = s(step.SVN, base_url=base_url, default_branch=default_branch,
+                  mode="export")
+
 
 builders = []
 
 b1 = {'name': "quick",
       'slavename': "bot1",
       'builddir': "quick",
-      'factory': QuickTwistedBuildFactory(svnurl,
+      'factory': QuickTwistedBuildFactory(source_update,
                                           python=["python2.2", "python2.3"]),
       }
 builders.append(b1)
@@ -99,7 +112,7 @@
 b22 = {'name': "full-2.2",
        'slavename': "bot-exarkun",
        'builddir': "full2.2",
-       'factory': FullTwistedBuildFactory(svnurl,
+       'factory': FullTwistedBuildFactory(source_copy,
                                           python="python2.2",
                                           processDocs=0),
        }
@@ -112,7 +125,7 @@
 b23 = {'name': "full-2.3",
        'slavename': "bot2",
        'builddir': "full2.3",
-       'factory': FullTwistedBuildFactory(svnurl,
+       'factory': FullTwistedBuildFactory(source_copy,
                                           python=["python2.3", "-Wall"],
                                           # use -Werror soon
                                           compileOpts=b23compile_opts,
@@ -128,7 +141,7 @@
 b24 = {'name': "full-2.4",
        'slavename': "bot-exarkun",
        'builddir': "full2.4",
-       'factory': FullTwistedBuildFactory(svnurl,
+       'factory': FullTwistedBuildFactory(source_copy,
                                           python=["python2.4", "-Wall"],
                                           # use -Werror soon
                                           compileOpts=b24compile_opts,
@@ -139,7 +152,7 @@
 b3 = {'name': "debuild",
       'slavename': "bot2",
       'builddir': "debuild",
-      'factory': TwistedDebsBuildFactory(svnurl,
+      'factory': TwistedDebsBuildFactory(source_export,
                                          python="python2.2"),
       }
 # debuild is offline while we figure out how to build 2.0 .debs from SVN
@@ -149,7 +162,7 @@
 b4 = {'name': "reactors",
       'slavename': "bot2",
       'builddir': "reactors",
-      'factory': TwistedReactorsBuildFactory(svnurl,
+      'factory': TwistedReactorsBuildFactory(source_copy,
                                              python="python2.3",
                                              reactors=reactors),
       }
@@ -159,7 +172,7 @@
 b23osx = {'name': "OS-X",
           'slavename': "bot-jerub",
           'builddir': "OSX-full2.4",
-          'factory': TwistedReactorsBuildFactory(svnurl,
+          'factory': TwistedReactorsBuildFactory(source_copy,
                                                  python="python2.4",
                                                  reactors=["default",
                                                            # "cf",
@@ -172,7 +185,7 @@
 b22w32 = {'name': "win32",
           'slavename': "bot-w32",
           'builddir': "W32-full2.2",
-          'factory': TwistedReactorsBuildFactory(svnurl,
+          'factory': TwistedReactorsBuildFactory(source_copy,
                                                  python="python",
                                                  compileOpts2=["-c","mingw32"],
                                                  reactors=["default",
@@ -185,7 +198,7 @@
 b23bsd = {'name': "freebsd",
           'slavename': "bot-suszko",
           'builddir': "bsd-full2.2",
-          'factory': TwistedReactorsBuildFactory(svnurl,
+          'factory': TwistedReactorsBuildFactory(source_copy,
                                                  python="python2.3",
                                                  reactors=["default",
                                                            "kqueue",
@@ -196,7 +209,7 @@
 b24threadless = {'name': 'threadless',
                  'slavename': 'bot-threadless',
                  'builddir': 'debian-threadless-2.4',
-                 'factory': TwistedReactorsBuildFactory(svnurl,
+                 'factory': TwistedReactorsBuildFactory(source_copy,
                                                         python='python',
                                                         reactors=['default'])}
 #builders.append(b24threadless)