From cc65f39088a8b23e3afe0b0cc9f51601a52206de Mon Sep 17 00:00:00 2001
From: Chris Richardson <chris@chrisrichardson.net>
Date: Tue, 10 Jan 2017 17:17:10 -0800
Subject: [PATCH] Fixed buildscript issues

---
 _build-and-test-all.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/_build-and-test-all.sh b/_build-and-test-all.sh
index 7120f90..b5187d5 100755
--- a/_build-and-test-all.sh
+++ b/_build-and-test-all.sh
@@ -47,7 +47,7 @@ fi
 
 export SERVICE_HOST=$DOCKER_HOST_IP
 
-./gradlew $* build -x :e2e-test:test
+./gradlew $BUILD_AND_TEST_ALL_EXTRA_GRADLE_ARGS $* build -x :e2e-test:test
 
 if [ -z "$EVENTUATE_LOCAL" ] && [ -z "$EVENTUATE_API_KEY_ID" -o -z "$EVENTUATE_API_KEY_SECRET" ] ; then
   echo You must set EVENTUATE_API_KEY_ID and  EVENTUATE_API_KEY_SECRET
@@ -58,11 +58,11 @@ ${DOCKER_COMPOSE?} build
 
 ${DOCKER_COMPOSE?} up -d
 
-$DIR/wait-for-services.sh $DOCKER_HOST_IP 8080 8081 8082
+$DIR/wait-for-services.sh $DOCKER_HOST_IP 8080 8081 8082 8083 8084
 
 set -e
 
-./gradlew -a $* :e2e-test:cleanTest :e2e-test:test -P ignoreE2EFailures=false
+./gradlew $BUILD_AND_TEST_ALL_EXTRA_GRADLE_ARGS -a $* :e2e-test:cleanTest :e2e-test:test -P ignoreE2EFailures=false
 
 if [ $NO_RM = false ] ; then
   ${DOCKER_COMPOSE?} stop