From 6e6beb02381b7ef7b9f08fe85f024b1c95a27ef1 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Wed, 27 Jul 2016 11:10:06 +0200
Subject: [PATCH] captain tests auto-detect docker gateway
---
captain_run.sh | 4 ++--
captain_test.sh | 1 +
tests/pre-test-run.sh | 7 +++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/captain_run.sh b/captain_run.sh
index 2b07f66a7..a68901c84 100755
--- a/captain_run.sh
+++ b/captain_run.sh
@@ -16,7 +16,7 @@ fi
docker run --name portal-db -p 5432:5432 -e POSTGRES_USER=postgres -d postgres
-echo 'Wating for DB to start...'
+echo 'Waiting for DB to start...'
until [ $(docker exec portal-db psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do
printf '.'
sleep 1
@@ -28,7 +28,7 @@ docker run --name portal-backend -p 8080:8080 \
-e "FRONTEND_REDIRECT_URL=http://localhost/home" \
-d hbpmip/portal-backend
-echo 'Wating for backend to start...'
+echo 'Waiting for backend to start...'
until [ $(docker logs portal-backend | grep "Started MIPApplication" | wc -l) -eq 1 ]; do
printf '.'
sleep 1
diff --git a/captain_test.sh b/captain_test.sh
index 5a2f2ecb9..4097b32be 100755
--- a/captain_test.sh
+++ b/captain_test.sh
@@ -1,3 +1,4 @@
#!/usr/bin/env bash
+export WORKSPACE=$(pwd)
captain test
\ No newline at end of file
diff --git a/tests/pre-test-run.sh b/tests/pre-test-run.sh
index 554e6c1e7..2ca3370c9 100755
--- a/tests/pre-test-run.sh
+++ b/tests/pre-test-run.sh
@@ -16,17 +16,20 @@ fi
docker run --name portal-db-test -p 5432:5432 -e POSTGRES_USER=postgres -d postgres
-echo 'Wating for DB to start...'
+echo 'Waiting for DB to start...'
until [ $(docker exec portal-db-test psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do
printf '.'
sleep 1
done
+GATEWAY_IP=$(docker inspect portal-db-test | grep \"Gateway\":\ \" | sed 's/.*Gateway\":\ \"\([^-]*\)\",/\1/' | head -n 1)
+
docker run --name portal-backend-test -p 8080:8080 \
-e "AUTHENTICATION=0" \
+-e "DB_URL=jdbc:postgresql://$GATEWAY_IP:5432/postgres" \
-d hbpmip/portal-backend
-echo 'Wating for backend to start...'
+echo 'Waiting for backend to start...'
until [ $(docker logs portal-backend-test | grep "Started MIPApplication" | wc -l) -eq 1 ]; do
printf '.'
sleep 1
--
GitLab