[Buildbot-commits] buildbot/docs/examples glib_master.cfg, 1.4, 1.5 hello.cfg, 1.9, 1.10 twisted_master.cfg, 1.43, 1.44

[Brian Warner]

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

Modified Files:
	glib_master.cfg hello.cfg twisted_master.cfg 
Log Message:
[project @ update example config files to match buildbot.steps.* move]

Original author: warner at lothar.com
Date: 2006-09-22 05:44:48

Index: glib_master.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/glib_master.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- glib_master.cfg	1 Oct 2004 01:56:29 -0000	1.4
+++ glib_master.cfg	22 Sep 2006 05:46:28 -0000	1.5
@@ -1,7 +1,7 @@
 #! /usr/bin/python
 
 from buildbot.changes.freshcvs import FreshCVSSource
-from buildbot.process.step import CVS
+from buildbot.steps.source import CVS
 from buildbot.process.factory import GNUAutoconf, s
 from buildbot.status import html
 

Index: hello.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/hello.cfg,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hello.cfg	1 Oct 2004 01:56:29 -0000	1.9
+++ hello.cfg	22 Sep 2006 05:46:28 -0000	1.10
@@ -1,7 +1,9 @@
 #! /usr/bin/python
 
 from buildbot import master
-from buildbot.process import factory, step
+from buildbot.process import factory
+from buildbot.steps.source import CVS, SVN, Darcs, Arch
+from buildbot.steps.shell import Configure, Compile, Test
 from buildbot.status import html, client
 from buildbot.changes.pb import PBChangeSource
 s = factory.s
@@ -16,16 +18,16 @@
 
 if 1:
     steps = [
-        s(step.CVS,
+        s(CVS,
           cvsroot="/usr/home/warner/stuff/Projects/BuildBot/demo/Repository",
           cvsmodule="hello",
           mode="clobber",
           checkoutDelay=6,
           alwaysUseLatest=True,
           ),
-        s(step.Configure),
-        s(step.Compile),
-        s(step.Test, command=["make", "check"]),
+        s(Configure),
+        s(Compile),
+        s(Test, command=["make", "check"]),
         ]
     b1 = {"name": "cvs-hello",
           "slavename": "bot1",
@@ -37,13 +39,13 @@
 if 1:
     svnrep="file:///usr/home/warner/stuff/Projects/BuildBot/demo/SVN-Repository"
     steps = [
-        s(step.SVN,
+        s(SVN,
           svnurl=svnrep+"/hello",
           mode="update",
           ),
-        s(step.Configure),
-        s(step.Compile),
-        s(step.Test, command=["make", "check"]),
+        s(Configure),
+        s(Compile),
+        s(Test, command=["make", "check"]),
         ]
     b1 = {"name": "svn-hello",
           "slavename": "bot1",
@@ -54,13 +56,13 @@
 
 if 1:
     steps = [
-        s(step.Darcs,
+        s(Darcs,
           repourl="http://localhost/~warner/hello-darcs",
           mode="copy",
           ),
-        s(step.Configure, command=["/bin/sh", "./configure"]),
-        s(step.Compile),
-        s(step.Test, command=["make", "check"]),
+        s(Configure, command=["/bin/sh", "./configure"]),
+        s(Compile),
+        s(Test, command=["make", "check"]),
         ]
     b1 = {"name": "darcs-hello",
           "slavename": "bot1",
@@ -71,14 +73,14 @@
 
 if 1:
     steps = [
-        s(step.Arch,
+        s(Arch,
           url="http://localhost/~warner/hello-arch",
           version="gnu-hello--release--2.1.1",
           mode="copy",
           ),
-        s(step.Configure),
-        s(step.Compile),
-        s(step.Test, command=["make", "check"]),
+        s(Configure),
+        s(Compile),
+        s(Test, command=["make", "check"]),
         ]
     b1 = {"name": "arch-hello",
           "slavename": "bot1",

Index: twisted_master.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/twisted_master.cfg,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- twisted_master.cfg	21 Aug 2006 03:38:05 -0000	1.43
+++ twisted_master.cfg	22 Sep 2006 05:46:28 -0000	1.44
@@ -14,7 +14,8 @@
 from buildbot import master
 from buildbot.changes.pb import PBChangeSource
 from buildbot.scheduler import Scheduler, Try_Userpass
-from buildbot.process import step
+from buildbot.steps.source import SVN
+from buildbot.steps.shell import ShellCommand
 from buildbot.process.factory import s
 from buildbot.process.process_twisted import \
      QuickTwistedBuildFactory, \
@@ -59,18 +60,18 @@
 if 0:
     # always build on trunk
     svnurl = "svn://svn.twistedmatrix.com/svn/Twisted/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(SVN, svnurl=svnurl, mode="update")
+    source_copy = s(SVN, svnurl=svnurl, mode="copy")
+    source_export = s(SVN, svnurl=svnurl, mode="export")
 else:
     # for build-on-branch, we use these instead
     baseURL = "svn://svn.twistedmatrix.com/svn/Twisted/"
     defaultBranch = "trunk"
-    source_update = s(step.SVN, baseURL=baseURL, defaultBranch=defaultBranch,
+    source_update = s(SVN, baseURL=baseURL, defaultBranch=defaultBranch,
                       mode="update")
-    source_copy = s(step.SVN, baseURL=baseURL, defaultBranch=defaultBranch,
+    source_copy = s(SVN, baseURL=baseURL, defaultBranch=defaultBranch,
                     mode="copy")
-    source_export = s(step.SVN, baseURL=baseURL, defaultBranch=defaultBranch,
+    source_export = s(SVN, baseURL=baseURL, defaultBranch=defaultBranch,
                       mode="export")
 
 
@@ -175,7 +176,7 @@
 
 jf = TwistedReactorsBuildFactory(source_copy,
                                  python="python2.4", reactors=["default"])
-jf.steps.insert(0, s(step.ShellCommand, workdir=".",
+jf.steps.insert(0, s(ShellCommand, workdir=".",
                      command=["ktrace", "rm", "-rf", "Twisted"]))
 b24osx = {'name': "OS-X",
           'slavename': "bot-jerub",