summaryrefslogtreecommitdiff
path: root/buildbot
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-06-01 03:07:02 +0200
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-06-01 03:07:02 +0200
commit8f96d5d80b2e2b446f5fd3045d32ca9bc54c523e (patch)
treeee1f4d0c6d609c219efeb9547d5d10306f15fd31 /buildbot
parent313f1b565a3a5ffabe87f61fd5ea69a962ac065d (diff)
downloaddeployment-8f96d5d80b2e2b446f5fd3045d32ca9bc54c523e.tar.gz
deployment-8f96d5d80b2e2b446f5fd3045d32ca9bc54c523e.tar.bz2
deployment-8f96d5d80b2e2b446f5fd3045d32ca9bc54c523e.zip
switcher invoked within buildbot
Diffstat (limited to 'buildbot')
-rw-r--r--buildbot/master.cfg38
1 files changed, 15 insertions, 23 deletions
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 04b76fa..b21f907 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -49,14 +49,14 @@ git_master = SingleBranchScheduler(
reason="Commit pushed for one of the sub-projects",
change_filter=filter.ChangeFilter(branch='master'),
treeStableTimer=300,
- builderNames=["global-build", "lcov-build"])
+ builderNames=["global-switcher", "lcov-build"])
force = ForceScheduler(
name="force-build",
revision=FixedParameter(name="revision", default=""),
repository=FixedParameter(name="repository", default=""),
project=FixedParameter(name="project", default=""),
- builderNames=["global-build", "lcov-build"])
+ builderNames=["global-switcher", "lcov-build"])
c['schedulers'] = [force, git_master]
@@ -70,31 +70,23 @@ from buildbot.steps.shell import Compile
from buildbot.steps.shell import Test
import os
-# Test builder
-globalBuild = BuildFactory()
-globalBuild.addStep(Git(repourl='git://git.taler.net/deployment.git',
+globalSwitcher = BuildFactory()
+globalSwitcher.addStep(Git(repourl='git://git.taler.net/deployment.git',
mode='full',
method='fresh',
haltOnFailure=True,
branch='master'))
-globalBuild.addStep(ShellCommand(
- name="invalidation",
- description="Invalidating timestamps",
- descriptionDone="timestamps invalidated",
- command=["./invalidate.sh"],
- workdir="build/taler-build"))
-globalBuild.addStep(ShellCommand(
- name="builder",
- description="Building Taler",
- descriptionDone="compiled",
- command=["make"],
- workdir="build/taler-build"))
+globalSwitcher.addStep(ShellCommand(name="invalidation",
+ description="Invalidating timestamps",
+ descriptionDone="timestamps invalidated",
+ command=["./switch_active.sh"],
+ workdir="build/taler-build"))
lcov = BuildFactory()
lcov.addStep(Git(repourl='git://git.taler.net/deployment.git',
- mode='full',
- method='fresh',
- haltOnFailure=True,
- branch='master'))
+ mode='full',
+ method='fresh',
+ haltOnFailure=True,
+ branch='master'))
lcov.addStep(ShellCommand(
name="invalidation",
description="Invalidating timestamps",
@@ -112,9 +104,9 @@ from buildbot.config import BuilderConfig
c['builders'] = []
c['builders'].append(
- BuilderConfig(name="global-build",
+ BuilderConfig(name="global-switcher",
slavenames=["testSlave"],
- factory=globalBuild))
+ factory=globalSwitcher))
c['builders'].append(
BuilderConfig(name="lcov-build",
slavenames=["lcovSlave"],