Fixed buildscript issues
This commit is contained in:
@@ -47,7 +47,7 @@ fi
|
|||||||
|
|
||||||
export SERVICE_HOST=$DOCKER_HOST_IP
|
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
|
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
|
echo You must set EVENTUATE_API_KEY_ID and EVENTUATE_API_KEY_SECRET
|
||||||
@@ -58,11 +58,11 @@ ${DOCKER_COMPOSE?} build
|
|||||||
|
|
||||||
${DOCKER_COMPOSE?} up -d
|
${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
|
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
|
if [ $NO_RM = false ] ; then
|
||||||
${DOCKER_COMPOSE?} stop
|
${DOCKER_COMPOSE?} stop
|
||||||
|
|||||||
Reference in New Issue
Block a user