commit e24e26596315857a9c3f93114827abbc5d47a7a2
parent c701ff4090a25df10db41b83debacb2eaa419580
Author: Florian Dold <florian.dold@gmail.com>
Date: Mon, 23 Sep 2019 20:58:48 +0200
no more playground
Diffstat:
7 files changed, 1 insertion(+), 46 deletions(-)
diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start
@@ -35,6 +35,3 @@ if $(taler-config -s twister -o taler_deploy >& /dev/null); then
taler-deployment-arm -i taler-twister-bank
fi
-if [[ "$TALER_ENV_NAME" = test ]]; then
- taler-deployment-arm -i taler-playground
-fi
diff --git a/bootstrap-taler b/bootstrap-taler
@@ -66,13 +66,6 @@ for component in twister bank merchant gnurl landing exchange donations blog bac
fi
done
-if [[ "$ENVNAME" = test ]]; then
- if ! test -d $HOME/playground; then
- git clone git://git.taler.net/playground
- git clone git://git.taler.net/help
- fi
-fi
-
for component in twister bank merchant landing exchange donations blog survey backoffice ; do
varname=tag_$component
tag=${!varname}
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -156,7 +156,7 @@ ALL_SCHEDULER = schedulers.SingleBranchScheduler(
branch_re="(master|stable)",
project_re="(backoffice|wallet|bank|exchange|"
"merchant|deployment|donations|twister|"
- "blog|help|survey|landing|playground)"
+ "blog|help|survey|landing)"
),
treeStableTimer=None,
builderNames=["test-builder"]
diff --git a/config/generate-config b/config/generate-config
@@ -114,10 +114,6 @@ def config(obj):
obj.cfg_put("blog", "uwsgi_unixpath_mode", "660")
obj.cfg_put("blog", "instance", "FSF")
- obj.cfg_put("playground", "uwsgi_serve", "unix")
- obj.cfg_put("playground", "uwsgi_unixpath", "$HOME/sockets/playground.uwsgi")
- obj.cfg_put("playground", "uwsgi_unixpath_mode", "660")
-
obj.cfg_put("backoffice-all", "backend", "https://backend.{}.taler.net/".format(obj.envname))
# Keep only one back-office service for all instances, for simplicity.
diff --git a/taler-arm/taler-playground.conf b/taler-arm/taler-playground.conf
@@ -1,4 +0,0 @@
-[taler-playground]
-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
@@ -10,7 +10,6 @@ all: exchange-stamp
all: gnunet-stamp
all: landing-stamp
all: merchant-stamp
-all: playground-stamp
all: survey-stamp
all: twister-stamp
@@ -77,10 +76,6 @@ survey-stamp: deployment-stamp
${BASE}/update_survey.sh
touch $@
-playground-stamp: deployment-stamp
- ${BASE}/update_playground.sh
- touch $@
-
lcov: gnunet-stamp deployment-stamp merchant-stamp exchange-stamp
export PATH=${HOME}/local/bin:${PATH}
./update_exchange.sh --coverage
diff --git a/taler-build/update_playground.sh b/taler-build/update_playground.sh
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-if test "demo" = ${TALER_ENV_NAME}; then
- echo "No playground for 'demo' envs."
- exit 0
-fi
-
-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
