taler-deployment

commit c55429b1c7901b4020e8cb350a9708c9bb9e7f06
parent 7f950d9ad4d320a82fa0edf2ec90c21e98e2eebf
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Wed, 22 Jun 2016 12:35:02 +0200

Merge branch 'master' of ssh://taler.net/var/git/deployment

Diffstat:
M
buildbot/master.cfg
 | 
33
+++++++++++++++++++++++++--------
M
taler-build/switch_active.sh
 | 
1
+

2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -9,6 +9,7 @@ local = "${HOME}/local"
 from buildbot.buildslave import BuildSlave
 c['slaves'] = [BuildSlave("testGreenSlave", "taler"),
                BuildSlave("testBlueSlave", "taler"),
+               BuildSlave("containersSlave", "taler"),
                BuildSlave("lcovSlave", "taler")]
 
 c['protocols'] = {'pb': {'port': 9989}}
@@ -31,18 +32,15 @@ c['change_source'].append(GitPoller(
         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))
-c['change_source'].append(GitPoller(
         'git://git.taler.net/merchant-frontends.git',
         workdir='gitpoller-workdir', branches=True,
         pollinterval=300))
 
 ####### SCHEDULERS
 
-from buildbot.schedulers.basic import SingleBranchScheduler, Dependent
+from buildbot.schedulers.basic import SingleBranchScheduler
 from buildbot.schedulers.forcesched import *
+from buildbot.schedulers.timed import *
 from buildbot.changes import filter
 
 c['schedulers'] = []
@@ -58,9 +56,14 @@ force = ForceScheduler(
     revision=FixedParameter(name="revision", default=""),
     repository=FixedParameter(name="repository", default=""),
     project=FixedParameter(name="project", default=""),
-    builderNames=["global-switcher", "lcov-build"])
+    builderNames=["global-switcher", "lcov-build", "auto-click"])
+
+selenium = Periodic(
+    name="clicking",
+    builderNames=["auto-click"],
+    periodicBuildTimer=5*60*60)
 
-c['schedulers'] = [force, git_master]
+c['schedulers'] = [force, git_master, selenium]
 
 ####### BUILDERS
 
@@ -80,7 +83,7 @@ def pickSlave(builder, slaves):
     if "blue" in activePath:
         toPick = "green"
     for s in slaves:
-        if map[toPick] == s.slavename:
+        if map[toPick] == s.slave.slavename:
             return s
     print "No suitable slave found"
     return None
@@ -120,6 +123,14 @@ lcov.addStep(ShellCommand(
 	command=["make", "lcov"], 
         workdir="build/taler-build"))
 
+autoClick = BuildFactory()
+autoClick.addStep(ShellCommand(
+        name="auto-click",
+        description="Performing demo",
+        descriptionDone="Demo finished",
+        command=["launch_selenium_test.sh"],
+        env={'PATH': "${HOME}/deployment/docker/selenium:${PATH}"}))
+
 from buildbot.config import BuilderConfig
 
 c['builders'] = []
@@ -132,6 +143,12 @@ c['builders'].append(
     BuilderConfig(name="lcov-build",
                   slavenames=["lcovSlave"],
                   factory=lcov))
+c['builders'].append(
+    BuilderConfig(name="auto-click",
+                  slavenames=["containersSlave"],
+                  factory=autoClick))
+
+
 ####### STATUS TARGETS
 
 c['status'] = []
diff --git a/taler-build/switch_active.sh b/taler-build/switch_active.sh
@@ -10,6 +10,7 @@ set -eu
 
 if ! taler-deployment-build; then
   echo "Failed to rebuild, not switching"
+  exit 1
 else
   echo "Successfully built, switching"
   ln -fs -T /home/$INACTIVE/sockets /home/test/sockets