diff options
Diffstat (limited to 'buildbot/master.cfg')
| -rw-r--r-- | buildbot/master.cfg | 94 |
1 files changed, 64 insertions, 30 deletions
diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 35a2dde..ab1a80e 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -9,8 +9,6 @@ local = "${HOME}/local" from buildbot.buildslave import BuildSlave c['slaves'] = [BuildSlave("testSlave", "taler"), BuildSlave("demoSlave", "taler")] -slaveNames = ["testSlave", "demoSlave"] - c['protocols'] = {'pb': {'port': 9989}} ####### CHANGESOURCES @@ -20,7 +18,7 @@ from buildbot.changes.gitpoller import GitPoller c['change_source'] = [] c['change_source'].append(GitPoller( 'git://git.taler.net/exchange.git', - workdir='gitpoller-workdir', branch='master', + workdir='gitpoller-workdir', branches=True, pollinterval=300)) ####### SCHEDULERS @@ -30,26 +28,33 @@ from buildbot.schedulers.forcesched import * from buildbot.changes import filter c['schedulers'] = [] -git = SingleBranchScheduler( - name="exchange-commit", +git_master = SingleBranchScheduler( + name="exchange-master", reason="Commit pushed to the git repository", change_filter=filter.ChangeFilter(branch='master'), treeStableTimer=600, - builderNames=["exchange-build"]) + builderNames=["exchange-test-build"]) + +git_stable = SingleBranchScheduler( + name="exchange-stable", + reason="Commit pushed to the git repository", + change_filter=filter.ChangeFilter(branch='stable'), + treeStableTimer=600, + builderNames=["exchange-demo-build"]) force = ForceScheduler( name="force-build", revision=FixedParameter(name="revision", default=""), repository=FixedParameter(name="repository", default=""), project=FixedParameter(name="project", default=""), - builderNames=["exchange-build","exchange-perf"]) + builderNames=["exchange-test-build"]) -successful = Dependent( - name="exchange-perf", - upstream=git, - builderNames=["exchange-perf"]) +# successful = Dependent( +# name="exchange-perf", +# upstream=git, +# builderNames=["exchange-perf"]) -c['schedulers'] = [git, force, successful] +c['schedulers'] = [git_master, force] ####### BUILDERS @@ -62,34 +67,59 @@ from buildbot.steps.shell import Test import os +# Demo builder +exchangeDemoBuild = BuildFactory() +exchangeDemoBuild.addStep(Git(repourl='git://git.taler.net/exchange.git', mode='full', method='fresh', branch='stable')) +exchangeDemoBuild.addStep(ShellCommand( + name="bootstrap", + description="bootstraping", + descriptionDone="bootstraped", + command=["./bootstrap"], + hideStepIf=True)) +exchangeDemoBuild.addStep(Configure(command=["./configure", "--prefix="+local, "--with-gnunet="+local])) +exchangeDemoBuild.addStep(Compile(command=["make"])) +exchangeDemoBuild.addStep(ShellCommand(name="Install", + description="Installing", + command=["make", "install"])) +# Starting from a clean database +exchangeDemoBuild.addStep(ShellCommand(name="Drop database", + command=["psql", "-c", "DROP DATABASE talercheck"], + hideStepIf=True, + flunkOnFailure=False)) +exchangeDemoBuild.addStep(ShellCommand(name="Create database", + command=["psql", "-c", "CREATE DATABASE talercheck"], + hideStepIf=True)) +# run the tests +exchangeDemoBuild.addStep(Test(command=["make","check"], + env={'PATH':local + "/bin:" + os.environ['PATH']})) -# Compilation, installation and tests of Taler -exchangeBuild = BuildFactory() -exchangeBuild.addStep(Git(repourl='git://git.taler.net/exchange.git', mode='full', method = 'fresh')) -exchangeBuild.addStep(ShellCommand( +# Test builder +exchangeTestBuild = BuildFactory() +exchangeTestBuild.addStep(Git(repourl='git://git.taler.net/exchange.git', mode='full', method='fresh', branch='master')) +exchangeTestBuild.addStep(ShellCommand( name="bootstrap", description="bootstraping", descriptionDone="bootstraped", command=["./bootstrap"], hideStepIf=True)) -exchangeBuild.addStep(Configure(command=["./configure", "--prefix="+local, "--with-gnunet="+local])) -exchangeBuild.addStep(Compile(command=["make"])) -exchangeBuild.addStep(ShellCommand(name="Install", +exchangeTestBuild.addStep(Configure(command=["./configure", "--prefix="+local, "--with-gnunet="+local])) +exchangeTestBuild.addStep(Compile(command=["make"])) +exchangeTestBuild.addStep(ShellCommand(name="Install", description="Installing", command=["make", "install"])) # Starting from a clean database -exchangeBuild.addStep(ShellCommand(name="Drop database", +exchangeTestBuild.addStep(ShellCommand(name="Drop database", command=["psql", "-c", "DROP DATABASE talercheck"], hideStepIf=True, flunkOnFailure=False)) -exchangeBuild.addStep(ShellCommand(name="Create database", +exchangeTestBuild.addStep(ShellCommand(name="Create database", command=["psql", "-c", "CREATE DATABASE talercheck"], hideStepIf=True)) # run the tests -exchangeBuild.addStep(Test(command=["make","check"], +exchangeTestBuild.addStep(Test(command=["make","check"], env={'PATH':local + "/bin:" + os.environ['PATH']})) -# running the performence tests for Taler +# running the performance tests for Taler exchangePerf = BuildFactory() # compile @@ -130,14 +160,18 @@ from buildbot.config import BuilderConfig c['builders'] = [] c['builders'].append( - BuilderConfig(name="exchange-build", - slavenames=slaveNames, - factory=exchangeBuild)) - + BuilderConfig(name="exchange-test-build", + slavenames=["testSlave"], + factory=exchangeTestBuild)) c['builders'].append( - BuilderConfig(name="exchange-perf", - slavenames=slaveNames, - factory=exchangePerf)) + BuilderConfig(name="exchange-demo-build", + slavenames=["demoSlave"], + factory=exchangeDemoBuild)) +# To be adapted to the new test/demo setting +# c['builders'].append( +# BuilderConfig(name="exchange-perf", +# slavenames=slaveNames, +# factory=exchangePerf)) ####### STATUS TARGETS |