taler-deployment

commit 5c370b551b0696813f4c47079a876d3ee731d178
parent 02856ec1fa0794c36c6489704df8b13ff4dd5695
Author: Florian Dold <florian.dold@gmail.com>
Date:   Thu, 22 Feb 2018 18:14:56 +0100

add playground confs

Diffstat:
M
bin/taler-deployment-start
 | 
4
++++
M
bootstrap-bluegreen
 | 
6
++++++
M
buildbot/master.cfg
 | 
2
+-
M
config/generate-config
 | 
4
++++
A
taler-arm/taler-playground.conf
 | 
4
++++
M
taler-build/Makefile
 | 
4
++++
M
taler-build/invalidate.sh
 | 
4
++++
A
taler-build/update_playground.sh
 | 
17
+++++++++++++++++

8 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start
@@ -33,3 +33,7 @@ taler-deployment-arm -i taler-blog
 taler-deployment-arm -i taler-survey
 taler-deployment-arm -i taler-aggregator
 taler-deployment-arm -i taler-exchange-wirewatch
+
+if [[ "$TALER_ENV_NAME" = test ]]; then
+  taler-deployment-arm -i taler-exchange-playground
+fi
diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen
@@ -60,6 +60,12 @@ for component in bank merchant gnurl landing exchange donations blog backoffice 
   fi
 done
 
+if [[ "$ENVNAME" = test ]]; then
+  if ! test -d $HOME/$component; then
+    git clone /var/git/playground.git
+  fi
+fi
+
 for component in bank merchant landing exchange donations blog survey backoffice ; do
   echo "Checking out $component to $BRANCH"
   git -C $HOME/$component checkout $BRANCH
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -96,7 +96,7 @@ ALL_SCHEDULER = schedulers.SingleBranchScheduler(
     name="all-scheduler",
     change_filter=util.ChangeFilter(
         branch="master",
-        project_re="backoffice|wallet|bank|exchange|merchant|deployment|donations|blog|survey|landing"),
+        project_re="backoffice|wallet|bank|exchange|merchant|deployment|donations|blog|survey|landing|playground"),
     treeStableTimer=None,
     builderNames=[
         "switcher-builder"])
diff --git a/config/generate-config b/config/generate-config
@@ -80,6 +80,10 @@ def config(currency, envname, exchange_pub, standalone):
     cfg_put("blog", "uwsgi_unixpath_mode", "660")
     cfg_put("blog", "instance", "FSF")
 
+    cfg_put("playground", "uwsgi_serve", "unix")
+    cfg_put("playground", "uwsgi_unixpath", "$HOME/sockets/playground.uwsgi")
+    cfg_put("playground", "uwsgi_unixpath_mode", "660")
+
     if standalone:
         cfg_put("backoffice-blog", "backend", "https://env.taler.net/{}/merchant-backend/".format(envname))
         cfg_put("backoffice-donations", "backend", "https://env.taler.net/{}/merchant-backend/".format(envname))
diff --git a/taler-arm/taler-playground.conf b/taler-arm/taler-playground.conf
@@ -0,0 +1,4 @@
+[taler-survey]
+TYPE = simple
+BINARY = taler-log-adapter
+OPTIONS = $HOME/logs/playground-%Y-%m-%d.log taler-playground serve-uwsgi
diff --git a/taler-build/Makefile b/taler-build/Makefile
@@ -53,6 +53,10 @@ survey-stamp: deployment-stamp
 	./update_survey.sh
 	touch $@
 
+playground-stamp: deployment-stamp
+	./update_playground.sh
+	touch $@
+
 lcov: gnunet-stamp deployment-stamp
 	export PATH=${HOME}/local/bin:${PATH}
 	./update_exchange.sh --coverage
diff --git a/taler-build/invalidate.sh b/taler-build/invalidate.sh
@@ -3,6 +3,10 @@
 set -eu
 components="deployment exchange merchant bank gnurl donations blog landing gnunet libmicrohttpd survey backoffice"
 
+if [[ "$TALER_ENV_NAME" = test ]]; then;
+  components="$components playground"
+fi
+
 for component in  $components ; do
   cd $HOME/$component
   git fetch
diff --git a/taler-build/update_playground.sh b/taler-build/update_playground.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -eu
+
+cd $HOME/playground/
+git clean -fxd
+
+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"
+
+git submodule update --init --force
+
+./bootstrap
+./configure --prefix="$HOME/local"
+make install