From 9a34c5051fca9c4e6f42669a524818efaa1abb81 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 14 Jul 2017 09:03:14 +0200 Subject: Fix drone Fix service container host name check current folder fix redis for integration test Fix more hostnames Signed-off-by: Morris Jobke --- autotest.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'autotest.sh') diff --git a/autotest.sh b/autotest.sh index 069488a3346..307af64edb7 100755 --- a/autotest.sh +++ b/autotest.sh @@ -212,7 +212,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 ..." @@ -246,7 +246,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 @@ -308,6 +308,9 @@ 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 -- cgit v1.2.3