diff options
| -rwxr-xr-x | bin/taler-deployment-start | 4 | ||||
| -rwxr-xr-x | bootstrap-bluegreen | 6 | ||||
| -rw-r--r-- | buildbot/master.cfg | 2 | ||||
| -rwxr-xr-x | config/generate-config | 4 | ||||
| -rw-r--r-- | taler-arm/taler-playground.conf | 4 | ||||
| -rw-r--r-- | taler-build/Makefile | 4 | ||||
| -rwxr-xr-x | taler-build/invalidate.sh | 4 | ||||
| -rwxr-xr-x | taler-build/update_playground.sh | 17 |
8 files changed, 44 insertions, 1 deletions
diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start index 9ceaef6..2371dc7 100755 --- 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 index 9c64b19..df173ad 100755 --- 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 index 9d04a9d..e5c99c1 100644 --- 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 index 5f11192..7d01d25 100755 --- 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 new file mode 100644 index 0000000..4102a19 --- /dev/null +++ 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 index ca05119..98f7fc7 100644 --- 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 index 13080dc..7f8a016 100755 --- 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 new file mode 100755 index 0000000..7500ec8 --- /dev/null +++ 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 |