Index: master.cfg =================================================================== --- master.cfg (revision 775266) +++ master.cfg (working copy) @@ -36,6 +36,10 @@ BuildSlave("bb-fbsd", private.slave6Pwd), BuildSlave("svn-w2k3-local", private.slave7Pwd), BuildSlave("svn-w2k3-ra", private.slave8Pwd), + BuildSlave("osx10.4-gcc4.0.1-ia32", private.slave9Pwd), + Buildslave("eh-debsarge1", private.slave10Pwd), + Buildslave("x64-ubuntu", private.slave11Pwd), + Buildslave("x64-centos", private.slave12Pwd), ] # to limit to two concurrent builds on a slave, use Index: projects/subversion.conf =================================================================== --- projects/subversion.conf (revision 775266) +++ projects/subversion.conf (working copy) @@ -5,18 +5,23 @@ from buildbot.steps.master import MasterShellCommand from buildbot.steps.transfer import FileUpload +# Use REPO where bb requires baseurl +REPO="http://svn.apache.org/repos/asf/" + c['schedulers'].append(AnyBranchScheduler(name="on-subversion-commit", branches=["subversion/trunk"], treeStableTimer=2*60, - builderNames=["subversion-trunk" , "slik-w2k3-x64-local" , "slik-w2k3-x64-ra"])) - + builderNames=["subversion-trunk" , "slik-w2k3-x64-local" , "slik-w2k3-x64-ra", + "x86-macosx-gnu shared", "debian-x86_64-32 shared gcc", + "x64-ubuntu gcc", "x64-centos gcc", + "x86-macosx-gnu shared daily ra_serf"])) #builders f30 = factory.BuildFactory() f30.addStep(SVN( mode="update", - baseURL="http://svn.apache.org/repos/asf/", + baseURL=REPO, defaultBranch="subversion/trunk", haltOnFailure=True, )) @@ -78,7 +83,7 @@ f45 = factory.BuildFactory() f45.addStep(SVN( mode="update", - baseURL="http://svn.apache.org/repos/asf/", + baseURL=REPO, defaultBranch="subversion/trunk", haltOnFailure=True, )) @@ -121,7 +126,7 @@ f46 = factory.BuildFactory() f46.addStep(SVN( mode="update", - baseURL="http://svn.apache.org/repos/asf/", + baseURL=REPO, defaultBranch="subversion/trunk", haltOnFailure=True, )) @@ -156,6 +161,84 @@ } c['builders'].append(b46) + +# define mac os x steps (lgo) +s47 = [shell.ShellCommand(name="Cleanup", command=["../svnclean.sh"], timeout=3600), + source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600), + shell.ShellCommand(name="Build", command=["../svnbuild.sh"], logfiles={"configlog": "config.log"}, timeout=3600, haltOnFailure=True), + shell.ShellCommand(name="Test fsfs+ra_neon", command=["../svncheck.sh", "fsfs", "ra_neon"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True), + ] +f47 = factory.BuildFactory(s47) +b47 = {'name': "x86-macosx-gnu shared", + 'slavename': "osx10.4-gcc4.0.1-ia32", + 'builddir': "osx10.4-gcc4.0.1-ia32", + 'factory': s47, + 'category': "prod", + } +c['builders'].append(b47) + +# define set of steps for eh-x84_64-32 (ehu), clean step comes first. +s48 = [shell.ShellCommand(name="Cleanup", command=["../svnclean.sh"], workdir='', timeout=3600), + source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600), + shell.ShellCommand(name="Build", command=["../svnbuild.sh"], logfiles={"configlog": "config.log"}, timeout=3600, haltOnFailure=True), + shell.ShellCommand(name="Test fsfs+ra_svn", command=["../svncheck.sh","fsfs","ra_svn"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True), + ] +f48 = factory.BuildFactory(s48) +b48 = {'name': "debian-x86_64-32 shared gcc", + 'slavename': "eh-debsarge1", + 'builddir': "eh-debsarge1", + 'factory': f48, + 'category': "prod", + } +c['builders'].append(b48) + +# ra_serf mac os x build steps (lgo) +s49 = [shell.ShellCommand(name="Cleanup", command=["../svnclean.sh"], timeout=3600), + source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600), + shell.ShellCommand(name="Build", command=["../svnbuild.sh"], logfiles={"configlog": "config.log"}, timeout=3600, haltOnFailure=True), + shell.ShellCommand(name="Test fsfs+ra_serf", command=["../svncheck.sh", "fsfs", "ra_serf"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True), + ] +f49 = factory.BuildFactory(s49) +b49 = {'name': "x86-macosx-gnu shared daily ra_serf", + 'slavename': "osx10.4-gcc4.0.1-ia32", + 'builddir': "osx10.4-gcc4.0.1-ia32-serf", + 'factory': f49, + 'category': "prod", + } +c['builders'].append(b49) + +# define set of steps for x64-ubuntu (hyrum), clean step comes first. +s50 = [shell.ShellCommand(name="Cleanup", command=["../svnclean.sh"], workdir='', timeout=3600), + source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600), + shell.ShellCommand(name="Build", command=["../svnbuild.sh"], logfiles={"configlog": "config.log"}, timeout=3600, haltOnFailure=True), + shell.ShellCommand(name="Test fsfs+ra_local", command=["../svncheck.sh","fsfs","ra_local"], logfiles={"testlog": "tests.log"}, timeout=3600,flunkOnFailure=False), + shell.ShellCommand(name="Test bindings", command=["../svncheck-bindings.sh","fsfs","ra_local"], logfiles={"testlog": "tests.log"}, timeout=3600,flunkOnFailure=True), + ] +f50 = factory.BuildFactory(s50) +b50 = {'name': "x64-ubuntu gcc", + 'slavename': "x64-ubuntu", + 'builddir': "x64-ubuntu", + 'factory': f50, + 'category': "prod", + } +c['builders'].append(b50) + +# define set of steps for x64-centos (wandisco), clean step comes first. +s51 = [shell.ShellCommand(name="Cleanup", command=["../svnclean.sh"], timeout=3600), + source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600), + shell.ShellCommand(name="Build", command=["../svnbuild.sh"], logfiles={"configlog": "config.log"}, timeout=3600, haltOnFailure=True), + shell.ShellCommand(name="Test fsfs+ra_local", command=["../svncheck.sh", "fsfs", "ra_neon"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True), + shell.ShellCommand(name="Test bindings", command=["../svncheck-bindings.sh","fsfs","ra_neon"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True), + ] +f51 = factory.BuildFactory(s51) +b51 = {'name': "x64-centos gcc", + 'slavename': "x64-centos", + 'builddir': "x64-centos", + 'factory': f51, + 'category': "prod", + } +c['builders'].append(b51) + #mail status c['status'].append(mail.MailNotifier(fromaddr="buildbot@apache.org", Index: projects/projects.conf =================================================================== --- projects/projects.conf (revision 775266) +++ projects/projects.conf (working copy) @@ -20,7 +20,7 @@ execfile(FP + 'stdcxx.conf', globals(), locals()) # Builders [27] execfile(FP + 'wookie.conf', globals(), locals()) # Builders [28] execfile(FP + 'tserver.conf', globals(), locals()) # Builders [29,33,39] * -execfile(FP + 'subversion.conf', globals(), locals()) #Builders [30] +execfile(FP + 'subversion.conf', globals(), locals()) #Builders [30,45,46,47,48,49,50,51] execfile(FP + 'etch.conf', globals(), locals()) #Builders [32] execfile(FP + 'libcloud.conf', globals(), locals()) #Builders [35] execfile(FP + 'tomcat.conf', globals(), locals()) #Builders [36,37]