diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh index e6fdf5c88..695effb56 100755 --- a/scripts/runAcceptanceTests.sh +++ b/scripts/runAcceptanceTests.sh @@ -6,6 +6,7 @@ mkdir -p target SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/master/runAcceptanceTests.sh" AT_WHAT_TO_TEST="SLEUTH" +BRANCH_NAME="edgware" cd target @@ -14,6 +15,6 @@ curl "${SCRIPT_URL}" --output runAcceptanceTests.sh chmod +x runAcceptanceTests.sh echo "Killing all running apps" -./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" -n +./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" -n -br "${BRANCH_NAME}" -./runAcceptanceTests.sh --whattotest "${AT_WHAT_TO_TEST}" --killattheend +./runAcceptanceTests.sh --whattotest "${AT_WHAT_TO_TEST}" --killattheend -br "${BRANCH_NAME}" diff --git a/scripts/runAcceptanceTestsStream.sh b/scripts/runAcceptanceTestsStream.sh index 7290c52b5..586973d50 100755 --- a/scripts/runAcceptanceTestsStream.sh +++ b/scripts/runAcceptanceTestsStream.sh @@ -6,6 +6,7 @@ mkdir -p target SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/master/runAcceptanceTests.sh" AT_WHAT_TO_TEST="SLEUTH_STREAM" +BRANCH_NAME="edgware" cd target @@ -14,6 +15,6 @@ curl "${SCRIPT_URL}" --output runAcceptanceTests.sh chmod +x runAcceptanceTests.sh echo "Killing all running apps" -./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" -n +./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" -n -br "${BRANCH_NAME}" -./runAcceptanceTests.sh --whattotest "${AT_WHAT_TO_TEST}" --killattheend +./runAcceptanceTests.sh --whattotest "${AT_WHAT_TO_TEST}" --killattheend -br "${BRANCH_NAME}" diff --git a/scripts/runAcceptanceTestsStreamKafka.sh b/scripts/runAcceptanceTestsStreamKafka.sh index d6dd00c1f..d6e772b0e 100755 --- a/scripts/runAcceptanceTestsStreamKafka.sh +++ b/scripts/runAcceptanceTestsStreamKafka.sh @@ -6,14 +6,15 @@ mkdir -p target SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/master/runAcceptanceTests.sh" AT_WHAT_TO_TEST="SLEUTH_STREAM" +BRANCH_NAME="edgware" cd target -curl "${SCRIPT_URL}" --output runAcceptanceTests.sh +curl "${SCRIPT_URL}" --output runAcceptanceTests.sh -br "${BRANCH_NAME}" chmod +x runAcceptanceTests.sh echo "Killing all running apps" ./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" -n -./runAcceptanceTests.sh --kafka --whattotest "${AT_WHAT_TO_TEST}" --killattheend -cli "1.3.3.BUILD-SNAPSHOT" +./runAcceptanceTests.sh --kafka --whattotest "${AT_WHAT_TO_TEST}" --killattheend -cli "1.3.3.BUILD-SNAPSHOT" -br "${BRANCH_NAME}" diff --git a/scripts/runAcceptanceTestsStreamOnCF.sh b/scripts/runAcceptanceTestsStreamOnCF.sh index 4c7080fd5..48a2c0e95 100755 --- a/scripts/runAcceptanceTestsStreamOnCF.sh +++ b/scripts/runAcceptanceTestsStreamOnCF.sh @@ -13,4 +13,4 @@ curl "${SCRIPT_URL}" --output runAcceptanceTests.sh chmod +x runAcceptanceTests.sh -./runAcceptanceTests.sh --whattotest "${AT_WHAT_TO_TEST}" --usecloudfoundry --reset +./runAcceptanceTests.sh --whattotest "${AT_WHAT_TO_TEST}" --usecloudfoundry --reset -br "${BRANCH_NAME}"