diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-14 10:03:14 +0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-07-14 14:02:16 +0300 |
| commit | 239ff34f3def73a9bf8f1ead9f868e9859a60984 (patch) | |
| tree | b1ce02a261b2c6bf1d13308fb5a5e239823acffc /autotest.sh | |
| parent | b9d7c48acf12d438b607d0e4214e6083ecc11fc5 (diff) | |
Fix drone
Fix service container host name
check current folder
fix redis for integration test
Fix more hostnames
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'autotest.sh')
| -rwxr-xr-x | autotest.sh | 7 |
1 files changed, 5 insertions, 2 deletions
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 |