From 04fe22900e9c698c1e743a0d0f384c186e027aba Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Mon, 7 Nov 2016 22:26:27 +0100
Subject: buildbot: mini fixes

---
 buildbot/master-lonelyslave.cfg | 59 +++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

(limited to 'buildbot')

diff --git a/buildbot/master-lonelyslave.cfg b/buildbot/master-lonelyslave.cfg
index 29d8b3f..07be094 100644
--- a/buildbot/master-lonelyslave.cfg
+++ b/buildbot/master-lonelyslave.cfg
@@ -64,7 +64,7 @@ force = ForceScheduler(
     revision=FixedParameter(name="revision", default=""),
     repository=FixedParameter(name="repository", default=""),
     project=FixedParameter(name="project", default=""),
-    builderNames=["lonelyness"])
+    builderNames=["lone-builder"])
 
 # For now, the whole withdraw/pay cliking is started manually
 # (as the blue-green infrastructure needs some upgrading)
@@ -76,7 +76,7 @@ forceClick = ForceScheduler(
     builderNames=["auto-click"])
 
 
-c['schedulers'] = [force, gitMaster, force-clicking]
+c['schedulers'] = [force, gitMaster, forceClick]
 
 ####### BUILDERS
 # They know *how* to build: which scripts need to be invoked,
@@ -92,18 +92,18 @@ import os
 
 lonelyness = BuildFactory()
 lonelyness.addStep(Git(repourl='git://git.taler.net/deployment.git',
-                              mode='full',
-                              method='fresh',
-                              alwaysUseLatest=True,
-                              haltOnFailure=True,
-                              branch='master'))
+                       mode='full',
+                       method='fresh',
+                       alwaysUseLatest=True,
+                       haltOnFailure=True,
+                       branch='master'))
 lonelyness.addStep(ShellCommand(name="switcher",
-	                            description="Lone compilation..",
-	                            descriptionDone="Compilation passed",
-	                            command=["make"], 
-                                    workdir="build/taler-build",
-                                    env={'PATH': "${HOME}/local/bin:${PATH}",
-                                         'TALER_CHECKDB': "postgres:///talercheck-${USER}"}))
+                                description="Lone compilation..",
+                                descriptionDone="Compilation passed",
+                                command=["make"], 
+                                workdir="build/taler-build",
+                                env={'PATH': "${HOME}/local/bin:${PATH}",
+                                     'TALER_CHECKDB': "postgres:///talercheck-${USER}"}))
 lcov = BuildFactory()
 lcov.addStep(Git(repourl='git://git.taler.net/deployment.git',
                  mode='full',
@@ -111,26 +111,23 @@ lcov.addStep(Git(repourl='git://git.taler.net/deployment.git',
                  alwaysUseLatest=True,
                  haltOnFailure=True,
                  branch='master'))
-lcov.addStep(ShellCommand(
-	name="invalidation",
-	description="Invalidating timestamps",
-	descriptionDone="timestamps invalidated",
-	command=["./invalidate.sh"], 
-        workdir="build/taler-build"))
-lcov.addStep(ShellCommand(
-	name="builder",
-	description="Compiling..",
-	descriptionDone="lcov files generated",
-	command=["make", "lcov"], 
-        workdir="build/taler-build"))
+lcov.addStep(ShellCommand(name="invalidation",
+                          description="Invalidating timestamps",
+                          descriptionDone="timestamps invalidated",
+                          command=["./invalidate.sh"], 
+                          workdir="build/taler-build"))
+lcov.addStep(ShellCommand(name="builder",
+                          description="Compiling..",
+                          descriptionDone="lcov files generated",
+                          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}"}))
+autoClick.addStep(ShellCommand(name="clicker",
+                               description="Performing demo",
+                               descriptionDone="Demo finished",
+                               command=["launch_selenium_test.sh"],
+                               env={'PATH': "${HOME}/deployment/docker/selenium:${PATH}"}))
 
 from buildbot.config import BuilderConfig
 
-- 
cgit v1.2.3