diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh index 89bf040cc..860b29688 100755 --- a/scripts/runAcceptanceTests.sh +++ b/scripts/runAcceptanceTests.sh @@ -4,9 +4,9 @@ set -o errexit mkdir -p target -SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/main/runAcceptanceTests.sh" +BRANCH_NAME="2021.0.x" +SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/${BRANCH_NAME}/runAcceptanceTests.sh" AT_WHAT_TO_TEST="SLEUTH" -BRANCH_NAME="main" cd target diff --git a/scripts/runAcceptanceTestsStream.sh b/scripts/runAcceptanceTestsStream.sh deleted file mode 100755 index 5fbcba72e..000000000 --- a/scripts/runAcceptanceTestsStream.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -o errexit - -mkdir -p target - -SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/main/runAcceptanceTests.sh" -AT_WHAT_TO_TEST="SLEUTH_STREAM" -BRANCH_NAME="main" - -cd target - -curl "${SCRIPT_URL}" --output runAcceptanceTests.sh - -chmod +x runAcceptanceTests.sh - -echo "Killing all running apps" -./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" -n -br "${BRANCH_NAME}" - -./runAcceptanceTests.sh --whattotest "${AT_WHAT_TO_TEST}" --killattheend -br "${BRANCH_NAME}" diff --git a/scripts/runAcceptanceTestsStreamKafka.sh b/scripts/runAcceptanceTestsStreamKafka.sh deleted file mode 100755 index 40c05b6c7..000000000 --- a/scripts/runAcceptanceTestsStreamKafka.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -o errexit - -mkdir -p target - -SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/main/runAcceptanceTests.sh" -AT_WHAT_TO_TEST="SLEUTH_STREAM" -BRANCH_NAME="main" - -cd target - -curl "${SCRIPT_URL}" --output runAcceptanceTests.sh - -chmod +x runAcceptanceTests.sh - -echo "Killing all running apps" -./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" -n -br "${BRANCH_NAME}" - -./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 deleted file mode 100755 index eb5f19729..000000000 --- a/scripts/runAcceptanceTestsStreamOnCF.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -o errexit - -mkdir -p target - -SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/main/runAcceptanceTests.sh" -AT_WHAT_TO_TEST="SLEUTH" -BRANCH_NAME="main" - -cd target - -curl "${SCRIPT_URL}" --output runAcceptanceTests.sh - -chmod +x runAcceptanceTests.sh - -./runAcceptanceTests.sh --whattotest "${AT_WHAT_TO_TEST}" --usecloudfoundry --reset -br "${BRANCH_NAME}"