Skip to content

Commit 653372b

Browse files
Polish
1 parent ecb9da8 commit 653372b

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

runAcceptanceTests.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,18 @@ cf d -f $ZQ_APP_NAME
104104
cd $root/zipkin-server
105105
mkdir -p build
106106
READY_FOR_TESTS="no"
107+
DOWNLOAD_ZIPKIN="${DOWNLOAD_ZIPKIN:-true}"
107108

108-
if [ -f "build/zipkin.jar" ]; then
109-
echo "Zipkin was downloaded - will continue"
109+
pushd build
110+
if [[ "${DOWNLOAD_ZIPKIN}" == "true" ]]
111+
echo -e "\nDownloading Zipkin Server"
112+
rm -rf zipkin.jar || echo "No zipkin.jar to remove"
113+
curl -sSL https://zipkin.io/quickstart.sh | bash -s
110114
else
111-
curl -sSL https://zipkin.io/quickstart.sh | bash -s
112-
mv zipkin.jar build/zipkin.jar
115+
echo "Won't download zipkin - the [DOWNLOAD_ZIPKIN] switch is set to false"
113116
fi
117+
popd
118+
114119
cf push && READY_FOR_TESTS="yes"
115120

116121
if [[ "${READY_FOR_TESTS}" == "no" ]] ; then

0 commit comments

Comments
 (0)