commit 8e548385ad48fa3e79128e104dff97f927d7b06e
parent da8e58b9b44d7c9f73486d309f31b247d27b4f42
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Fri, 24 Jun 2016 18:06:22 +0200
Merge branch 'master' of ssh://taler.net/var/git/deployment
Diffstat:
2 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -4,6 +4,14 @@
c = BuildmasterConfig = {}
local = "${HOME}/local"
+####### LOGS SIZE
+
+c['changeHorizon'] = 20
+c['buildHorizon'] = 10
+c['eventHorizon'] = 5
+c['logHorizon'] = 4
+c['buildCacheSize'] = 2
+
####### BUILDSLAVES
from buildbot.buildslave import BuildSlave
diff --git a/taler-build/switch_active.sh b/taler-build/switch_active.sh
@@ -1,37 +1,19 @@
#!/bin/bash
-# Build all Taler components (currently only the wallet build+test is
-# not supported) for the non active party of blue-green, and switch to
-# it whenever compilation and testing succeed.
-# The script is not portable to system using different usernames and directories,
+# Build all Taler components for the non active party
+# of blue-green, and switch to it whenever compilation
+# and testing succeed. The script is not portable to
+# system using different usernames and directories,
# respect to taler.net, for blue-green deployments
set -eu
-whoami
-
-# figure out which is the inactive
-ACTIVE=$(readlink /home/test/sockets | awk -F/ '{print $3}')
-
-# exit if active
-if [[ $(whoami) == $ACTIVE ]]; then
- exit
-fi
-
-if [[ 'test-green' == $ACTIVE ]]; then
- INACTIVE='test-blue'
-else
- INACTIVE='test-green'
-fi
-
-# build and restart
-# FIXME calling 'make check' before switching still missing
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
+ ln -fs -T /home/$(whoami)/sockets /home/test/sockets
fi
taler-deployment-restart
