taler-deployment

commit 8f96d5d80b2e2b446f5fd3045d32ca9bc54c523e
parent 313f1b565a3a5ffabe87f61fd5ea69a962ac065d
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Wed,  1 Jun 2016 03:07:02 +0200

switcher invoked within buildbot

Diffstat:
M
buildbot/master.cfg
 | 
38
+++++++++++++++-----------------------

1 file changed, 15 insertions(+), 23 deletions(-)
diff --git 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"],