[Buildbot-commits] buildbot/docs/examples hello.cfg, 1.10, 1.11 twisted_master.cfg, 1.47, 1.48

[Brian Warner]

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

Modified Files:
	hello.cfg twisted_master.cfg 
Log Message:
[project @ examples: bring them up to date or get rid of them. Closes #79.]

Original author: warner at lothar.com
Date: 2007-09-30 02:01:26+00:00

Index: hello.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/hello.cfg,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hello.cfg	22 Sep 2006 05:46:28 -0000	1.10
+++ hello.cfg	30 Sep 2007 02:02:10 -0000	1.11
@@ -1,91 +1,79 @@
 #! /usr/bin/python
 
 from buildbot import master
+from buildbot.buildslave import BuildSlave
 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
 
 BuildmasterConfig = c = {}
 
-c['bots'] = [["bot1", "sekrit"]]
+c['slaves'] = [BuildSlave("bot1", "sekrit")]
 
-c['sources'] = []
-c['sources'].append(PBChangeSource(prefix="trunk"))
+c['change_source'] = PBChangeSource(prefix="trunk")
 c['builders'] = []
 
-if 1:
-    steps = [
-        s(CVS,
-          cvsroot="/usr/home/warner/stuff/Projects/BuildBot/demo/Repository",
-          cvsmodule="hello",
-          mode="clobber",
-          checkoutDelay=6,
-          alwaysUseLatest=True,
-          ),
-        s(Configure),
-        s(Compile),
-        s(Test, command=["make", "check"]),
-        ]
+if True:
+    f = factory.BuildFactory()
+    f.addStep(CVS(cvsroot="/usr/home/warner/stuff/Projects/BuildBot/demo/Repository",
+                  cvsmodule="hello",
+                  mode="clobber",
+                  checkoutDelay=6,
+                  alwaysUseLatest=True,
+                  ))
+    f.addStep(Configure())
+    f.addStep(Compile())
+    f.addStep(Test(command=["make", "check"]))
     b1 = {"name": "cvs-hello",
           "slavename": "bot1",
           "builddir": "cvs-hello",
-          "factory": factory.BuildFactory(steps),
+          "factory": f,
           }
     c['builders'].append(b1)
 
-if 1:
+if True:
     svnrep="file:///usr/home/warner/stuff/Projects/BuildBot/demo/SVN-Repository"
-    steps = [
-        s(SVN,
-          svnurl=svnrep+"/hello",
-          mode="update",
-          ),
-        s(Configure),
-        s(Compile),
-        s(Test, command=["make", "check"]),
-        ]
+    f = factory.BuildFactory()
+    f.addStep(SVN(svnurl=svnrep+"/hello", mode="update"))
+    f.addStep(Configure())
+    f.addStep(Compile()),
+    f.addStep(Test(command=["make", "check"]))
     b1 = {"name": "svn-hello",
           "slavename": "bot1",
           "builddir": "svn-hello",
-          "factory": factory.BuildFactory(steps),
+          "factory": f,
           }
     c['builders'].append(b1)
 
-if 1:
-    steps = [
-        s(Darcs,
-          repourl="http://localhost/~warner/hello-darcs",
-          mode="copy",
-          ),
-        s(Configure, command=["/bin/sh", "./configure"]),
-        s(Compile),
-        s(Test, command=["make", "check"]),
-        ]
+if True:
+    f = factory.BuildFactory()
+    f.addStep(Darcs(repourl="http://localhost/~warner/hello-darcs",
+                    mode="copy"))
+    f.addStep(Configure(command=["/bin/sh", "./configure"]))
+    f.addStep(Compile())
+    f.addStep(Test(command=["make", "check"]))
     b1 = {"name": "darcs-hello",
           "slavename": "bot1",
           "builddir": "darcs-hello",
-          "factory": factory.BuildFactory(steps),
+          "factory": f,
           }
     c['builders'].append(b1)
 
-if 1:
-    steps = [
-        s(Arch,
-          url="http://localhost/~warner/hello-arch",
-          version="gnu-hello--release--2.1.1",
-          mode="copy",
-          ),
-        s(Configure),
-        s(Compile),
-        s(Test, command=["make", "check"]),
-        ]
+if True:
+    f = factory.BuildFactory()
+    f.addStep(Arch(url="http://localhost/~warner/hello-arch",
+                   version="gnu-hello--release--2.1.1",
+                   mode="copy",
+                   ))
+    f.addStep(Configure(command=["/bin/sh", "./configure"]))
+    f.addStep(Compile())
+    f.addStep(Test(command=["make", "check"]))
     b1 = {"name": "arch-hello",
           "slavename": "bot1",
           "builddir": "arch-hello",
-          "factory": factory.BuildFactory(steps),
+          "factory": f,
           }
     c['builders'].append(b1)
 
@@ -98,7 +86,7 @@
 c['debugPassword'] = "asdf"
 c['manhole'] = master.Manhole(9900, "username", "password")
 
-c['status'] = [html.Waterfall(http_port=8080),
+c['status'] = [html.WebStatus(http_port=8080),
                client.PBListener(port=8008),
                ]
 

Index: twisted_master.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/twisted_master.cfg,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- twisted_master.cfg	24 Nov 2006 20:46:08 -0000	1.47
+++ twisted_master.cfg	30 Sep 2007 02:02:10 -0000	1.48
@@ -1,5 +1,10 @@
 #! /usr/bin/python
 
+# NOTE: this configuration file is from the buildbot-0.7.5 era or earlier. It
+# has not been brought up-to-date with the standards of buildbot-0.7.6 . For
+# examples of modern usage, please see hello.cfg, or the sample.cfg which is
+# installed when you run 'buildbot create-master'.
+
 # This configuration file is described in $BUILDBOT/docs/config.xhtml
 
 # This is used (with online=True) to run the Twisted Buildbot at