From 6ec321ef236643863fa7bc471c523eda3d1c653b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 14 Jul 2017 09:03:14 +0200 Subject: [PATCH] Fix drone Fix service container host name Fix more hostnames Signed-off-by: Morris Jobke --- autotest.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/autotest.sh b/autotest.sh index f42ca41de9d..1e45dce2edf 100755 --- a/autotest.sh +++ b/autotest.sh @@ -200,7 +200,7 @@ function execute_tests { fi mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true else - DATABASEHOST=127.0.0.1 + DATABASEHOST=mysql fi fi echo "Waiting for MySQL initialisation ..." @@ -234,7 +234,7 @@ function execute_tests { fi mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true else - DATABASEHOST=127.0.0.1 + DATABASEHOST=mysqlmb4 fi fi @@ -296,6 +296,17 @@ function execute_tests { echo "Postgres is up." else + if [ ! -z "$DRONE" ] ; then + DATABASEHOST=postgres + fi + echo "Waiting for Postgres to be available ..." + if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 5432 60; then + echo "[ERROR] Waited 60 seconds, no response" >&2 + exit 1 + fi + echo "Give it 10 additional seconds ..." + sleep 10 + if [ -z "$DRONE" ] ; then # no need to drop the DB when we are on CI dropdb -U "$DATABASEUSER" "$DATABASENAME" || true fi