From 788ca6c6e757789596757b6444735c929f7e8919 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 8 Dec 2015 20:14:18 +0100 Subject: [PATCH] Should fail the build if acceptance tests fail at any time --- .travis.yml | 2 +- scripts/runAcceptanceTests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55d6df1b..05230a88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: script: - '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || ./mvnw --settings .settings.xml clean deploy -nsu' - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || ./mvnw clean install -nsu' -- sh scripts/runAcceptanceTests.sh +- sh -e scripts/runAcceptanceTests.sh env: global: - GIT_NAME="Spencer Gibb" diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh index 252be2a0..e4b35d2d 100644 --- a/scripts/runAcceptanceTests.sh +++ b/scripts/runAcceptanceTests.sh @@ -28,7 +28,7 @@ done if [ "$success" = true ] ; then echo "Successfully booted up all the apps. Proceeding with the acceptance tests" - sh -e runAcceptanceTests.sh -Dspring.zipkin.enabled=false -Dspring.cloud.zookeeper.maxRetries=5 -Dpresenting.url=$url:9091 + bash -e runAcceptanceTests.sh -Dspring.zipkin.enabled=false -Dspring.cloud.zookeeper.maxRetries=5 -Dpresenting.url=$url:9091 else echo "Failed to boot the apps. Will now kill the containers and remove them" fi