diff --git a/.travis.yml b/.travis.yml index 9056aad58..070e8fc21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - gem install asciidoctor install: - ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true -- '[ "${TRAVIS_BRANCH}" != "master" ] || ./docs/src/main/asciidoc/ghpages.sh' +- 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then ./docs/src/main/asciidoc/ghpages.sh; fi' script: - '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || ./mvnw -s .settings.xml deploy -nsu -Dmaven.test.redirectTestOutputToFile=true' - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || ./mvnw install -nsu -Dmaven.test.redirectTestOutputToFile=true' diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh index af4227199..2c0fc6dcc 100644 --- a/scripts/runAcceptanceTests.sh +++ b/scripts/runAcceptanceTests.sh @@ -1,5 +1,13 @@ -#!/bin/sh -set -e +#!/bin/bash -curl https://raw.githubusercontent.com/spring-cloud-samples/brewery/master/acceptance-tests/scripts/runDockerAcceptanceTests.sh --output runDockerAcceptanceTests.sh -sh runDockerAcceptanceTests.sh -t=SLEUTH -v=1.0.0.BUILD-SNAPSHOT \ No newline at end of file +set -o errexit + +SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/master/acceptance-tests/scripts/runDockerAcceptanceTests.sh" +AT_WHAT_TO_TEST="SLEUTH" +AT_VERSION="1.0.0.BUILD-SNAPSHOT" + +curl "${SCRIPT_URL}" --output runDockerAcceptanceTests.sh + +chmod +x runDockerAcceptanceTests.sh + +./runDockerAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" -v "${AT_VERSION}"