ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for pipelines

This commit is contained in:
Daniel Egger 2022-11-09 12:39:15 +01:00
parent d1de8d4ace
commit 0ac51bb9f6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
env/bitbucket/prepare_for_test.sh vendored
View File

@ -4,8 +4,9 @@
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
export LANG=C.UTF-8 export LANG=C.UTF-8
export PG_USER="postgres" export PGUSER="postgres"
export PG_PORT=5432 export PGPORT=5432
export PGHOST="localhost"
export OPENSSL_CONF=/etc/ssl/ export OPENSSL_CONF=/etc/ssl/

5
prepare_server.sh
View File

@ -40,10 +40,9 @@ echo "SKIP_SETUP = ${SKIP_SETUP}"
# migrate env vars to the built-in postgres variables # migrate env vars to the built-in postgres variables
if [ -z ${PGDATABASE+x} ]; then # var is empty if [ -z ${PGDATABASE+x} ]; then # var is empty
PGDATABASE=${POSTGRES_DB:-vbv_lernwelt}; PGDATABASE=${POSTGRES_DB:-vbv_lernwelt};
POSTGRES_DB=$PGDATABASE
fi fi
if [ -z ${PGHOST+x} ]; then # var is empty if [ -z ${PGHOST+x} ]; then # var is empty
PGHOST=${POSTGRES_DB:-localhost}; PGHOST=${POSTGRES_HOST:-localhost};
fi fi
if [ -z ${PGPORT+x} ]; then # var is empty if [ -z ${PGPORT+x} ]; then # var is empty
PGPORT=${POSTGRES_PORT:-5432} PGPORT=${POSTGRES_PORT:-5432}
@ -59,7 +58,7 @@ if [ "$SKIP_SETUP" = false ]; then
echo "Check postgres connection" echo "Check postgres connection"
psql -d postgres -c "SELECT 1" # use default db to connect to psql -d postgres -c "SELECT 1" # use default db to connect to
echo "Drop all connections to $PGDATABASE" echo "Drop all connections to $PGDATABASE"
psql -c "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$POSTGRES_DB' AND pid <> pg_backend_pid();" > /dev/null 2>&1 psql -c "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$PGDATABASE' AND pid <> pg_backend_pid();" > /dev/null 2>&1 || true
echo "Drop database: $PGDATABASE" echo "Drop database: $PGDATABASE"
psql -d postgres -c "drop database if exists $PGDATABASE;" # use default db to drop another database, can't drop the currently connected database psql -d postgres -c "drop database if exists $PGDATABASE;" # use default db to drop another database, can't drop the currently connected database
echo "Create database: $PGDATABASE" echo "Create database: $PGDATABASE"