taler-deployment

commit 2769d6b8fac9dd45da2f4203d667a9d53dae30e4
parent ed827ce1bc7bd65d477c87d9b01a3b77c44f9526
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Mon, 27 Nov 2017 12:44:12 +0100

builders don't use deployment code cloned by the
builder step, instead they use the one provided by
the dedicated update_deployment.sh script.

Diffstat:
M
buildbot/master.cfg
 | 
16
++++++----------
M
taler-build/update_deployment.sh
 | 
2
--

2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -161,42 +161,38 @@ DEBUG_FACTORY.addStep(ShellCommand(
     command=["echo", "I'm here!"]))
 
 LINT_FACTORY = util.BuildFactory()
-LINT_FACTORY.addStep(git_step(
-    "git://git.taler.net/deployment.git"))
 LINT_FACTORY.addStep(ShellCommand(
     name="invalidation",
     description="checking changes",
     descriptionDone="changes checked",
     command=["./invalidate.sh", "--lint"],
-    workdir="build/taler-build"))
+    workdir="${HOME}/deployment/taler-build"))
 LINT_FACTORY.addStep(ShellCommand(
     name="linting",
     description="Linting..",
     descriptionDone="Linted",
     command=["make", "-f", "MakefileLint"],
-    workdir="build/taler-build"))
+    workdir="${HOME}/deployment/taler-build"))
 
 LCOV_FACTORY = util.BuildFactory()
-LCOV_FACTORY.addStep(git_step(
-    'git://git.taler.net/deployment.git'))
 LCOV_FACTORY.addStep(ShellCommand(
     name="invalidation",
     description="Invalidating timestamps",
     descriptionDone="timestamps invalidated",
     command=["./invalidate.sh"],
-    workdir="build/taler-build"))
+    workdir="${HOME}/deployment/taler-build"))
 LCOV_FACTORY.addStep(ShellCommand(
     name="build",
     description="Compiling..",
     descriptionDone="lcov files generated",
     command=["make", "lcov"],
-    workdir="build/taler-build",
+    workdir="${HOME}/taler-build",
     env={"PATH": "${HOME}/local/bin:${PATH}",
          "TALER_CHECKDB": "postgresql:///talercheck?host=/home/${USER}/sockets"}))
 
 SWITCHER_FACTORY = util.BuildFactory()
-SWITCHER_FACTORY.addStep(git_step(
-    'git://git.taler.net/deployment.git'))
+SWITCHER_FACTORY.git_step(
+    "git://git.taler.net/deployment.git")
 SWITCHER_FACTORY.addStep(ShellCommand(
     name="build",
     description="Building inactive blue-green party.",
diff --git a/taler-build/update_deployment.sh b/taler-build/update_deployment.sh
@@ -8,10 +8,8 @@
 set -eu
 
 cd $HOME/deployment
-git clean -fdx
 
 git fetch
 # reset to updated upstream branch, but only if we're tracking a branch
 branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD)
 git reset --hard "$branch"
-