commit 47bfe88fb3c6042d69f2c50a4b35ce2b55677764
parent 05cd95de96126d9a2d025e9513404cb3c3faab26
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Mon, 18 Apr 2016 18:22:38 +0200
removing "demo" builder since not being used soon + linking Makefile-based project-wise compilation to buildbot
Diffstat:
| M | buildbot/master.cfg | | | 133 | ++++++++++++++++--------------------------------------------------------------- |
1 file changed, 26 insertions(+), 107 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -20,6 +20,18 @@ c['change_source'].append(GitPoller(
'git://git.taler.net/exchange.git',
workdir='gitpoller-workdir', branches=True,
pollinterval=300))
+c['change_source'].append(GitPoller(
+ 'git://git.taler.net/merchant.git',
+ workdir='gitpoller-workdir', branches=True,
+ pollinterval=300))
+c['change_source'].append(GitPoller(
+ 'git://git.taler.net/bank.git',
+ workdir='gitpoller-workdir', branches=True,
+ pollinterval=300))
+c['change_source'].append(GitPoller(
+ 'git://git.taler.net/deployment.git',
+ workdir='gitpoller-workdir', branches=True,
+ pollinterval=300))
####### SCHEDULERS
@@ -30,18 +42,11 @@ from buildbot.changes import filter
c['schedulers'] = []
git_master = SingleBranchScheduler(
name="exchange-master",
- reason="Commit pushed to the git repository",
+ reason="Commit pushed for one of the sub-projects",
change_filter=filter.ChangeFilter(branch='master'),
treeStableTimer=600,
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=""),
@@ -49,11 +54,6 @@ force = ForceScheduler(
project=FixedParameter(name="project", default=""),
builderNames=["exchange-test-build"])
-# successful = Dependent(
-# name="exchange-perf",
-# upstream=git,
-# builderNames=["exchange-perf"])
-
c['schedulers'] = [git_master, force]
####### BUILDERS
@@ -66,95 +66,23 @@ from buildbot.steps.shell import Compile
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']}))
-
# Test builder
exchangeTestBuild = BuildFactory()
-exchangeTestBuild.addStep(Git(repourl='git://git.taler.net/exchange.git', mode='full', method='fresh', branch='master'))
+exchangeTestBuild.addStep(Git(repourl='git://git.taler.net/deployment.git', mode='full', method='fresh', branch='master'))
+exchangeTestBuild.addStep(ShellCommand(
+ name="mass-build-invalidation",
+ description="Invalidating timestamps",
+ descriptionDone="done",
+ command=["./invalidate.sh"],
+ workdir="taler-build",
+ hideStepIf=True))
exchangeTestBuild.addStep(ShellCommand(
- name="bootstrap",
- description="bootstraping",
- descriptionDone="bootstraped",
- command=["./bootstrap"],
+ name="mass-build-build",
+ description="Building all components",
+ descriptionDone="done",
+ command=["make"],
+ workdir="taler-build",
hideStepIf=True))
-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
-exchangeTestBuild.addStep(ShellCommand(name="Drop database",
- command=["psql", "-c", "DROP DATABASE talercheck"],
- hideStepIf=True,
- flunkOnFailure=False))
-exchangeTestBuild.addStep(ShellCommand(name="Create database",
- command=["psql", "-c", "CREATE DATABASE talercheck"],
- hideStepIf=True))
-# run the tests
-exchangeTestBuild.addStep(Test(command=["make","check"],
- env={'PATH':local + "/bin:" + os.environ['PATH']}))
-
-# running the performance tests for Taler
-exchangePerf = BuildFactory()
-
-# compile
-exchangePerf.addStep(Git(repourl='git://git.taler.net/exchange.git',
- mode='full',
- method = 'fresh'))
-exchangePerf.addStep(ShellCommand(
- name="bootstrap",
- description="bootstraping",
- descriptionDone="bootstraped",
- command=["./bootstrap"],
- hideStepIf=True))
-exchangePerf.addStep(Configure(command=["./configure", "--prefix="+local, "--with-gnunet="+local]))
-exchangePerf.addStep(Compile(command=["make"]))
-exchangePerf.addStep(Compile(command=["make","-C","src/exchangedb/","perf-exchangedb"]))
-
-# create the database anew
-exchangePerf.addStep(ShellCommand(name="Drop database",
- command=["psql",
- "-c",
- "DROP DATABASE talercheck"],
- hideStepIf=True))
-exchangePerf.addStep(ShellCommand(name="Create database",
- command=["psql",
- "-c",
- "CREATE DATABASE talercheck"],
- hideStepIf=True))
-
-# Run the performance tests
-exchangePerf.addStep(ShellCommand(name="perf-measure",
- description="measuring",
- descriptionDone="measured",
- command=["./perf-exchangedb"],
- workdir="build/src/exchangedb",
- timeout=None))
from buildbot.config import BuilderConfig
@@ -163,15 +91,6 @@ c['builders'].append(
BuilderConfig(name="exchange-test-build",
slavenames=["testSlave"],
factory=exchangeTestBuild))
-c['builders'].append(
- 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
