Fixes parameter parsing in AWS scripts.
diff --git a/infrastructure/scripts/aws/copy_to_cluster.sh b/infrastructure/scripts/aws/copy_to_cluster.sh
index 46d0509..9b9a95c 100755
--- a/infrastructure/scripts/aws/copy_to_cluster.sh
+++ b/infrastructure/scripts/aws/copy_to_cluster.sh
@@ -24,7 +24,7 @@
REPO='https://github.com/apache/geode'
-while :; do
+while (( "$#" )); do
case $1 in
-t|--tag )
if [ "$2" ]; then
@@ -50,10 +50,8 @@
;;
-?* )
printf 'Invalid option: %s\n' "$1" >&2
- break
+ exit 1
;;
- * )
- break
esac
shift
done
diff --git a/infrastructure/scripts/aws/destroy_cluster.sh b/infrastructure/scripts/aws/destroy_cluster.sh
index b6cafec..a56d8e2 100755
--- a/infrastructure/scripts/aws/destroy_cluster.sh
+++ b/infrastructure/scripts/aws/destroy_cluster.sh
@@ -20,7 +20,7 @@
TAG=
CI=
-while :; do
+while (( "$#" )); do
case $1 in
-t|--tag )
if [ "$2" ]; then
@@ -49,10 +49,8 @@
;;
-?* )
printf 'Invalid option: %s\n' "$1" >&2
- break
+ exit 1
;;
- * )
- break
esac
shift
done
diff --git a/infrastructure/scripts/aws/launch_cluster.sh b/infrastructure/scripts/aws/launch_cluster.sh
index 13d6b33..b07fbe9 100755
--- a/infrastructure/scripts/aws/launch_cluster.sh
+++ b/infrastructure/scripts/aws/launch_cluster.sh
@@ -23,8 +23,8 @@
COUNT=
CI=
-while :; do
- case $1 in
+while (( "$#" )); do
+ case "$1" in
-t|--tag )
if [ "$2" ]; then
TAG=$2
@@ -62,10 +62,8 @@
;;
-?* )
printf 'Invalid option: %s\n' "$1" >&2
- break
+ exit 1
;;
- * )
- break
esac
shift
done
diff --git a/infrastructure/scripts/aws/run_against_baseline.sh b/infrastructure/scripts/aws/run_against_baseline.sh
index 52bc07a..fa2f4fd 100755
--- a/infrastructure/scripts/aws/run_against_baseline.sh
+++ b/infrastructure/scripts/aws/run_against_baseline.sh
@@ -38,7 +38,7 @@
METADATA=
OUTPUT=
-while :; do
+while (( "$#" )); do
case $1 in
-t|--tag )
if [ "$2" ]; then
@@ -133,10 +133,8 @@
;;
-?* )
printf 'Invalid option: %s\n' "$1" >&2
- break
+ exit 1
;;
- * )
- break
esac
shift
done
@@ -155,6 +153,27 @@
OUTPUT="$(pwd)/${OUTPUT}"
fi
+if [[ -z "${BASELINE_BRANCH}" ]]; then
+ ./run_tests.sh \
+ -t ${TAG} \
+ -v ${BASELINE_VERSION} \
+ -p ${BENCHMARK_REPO} \
+ -e ${BENCHMARK_BRANCH} \
+ -o ${OUTPUT}/baseline \
+ -m "${METADATA}" \
+ -- "$@"
+else
+ ./run_tests.sh \
+ -t ${TAG} \
+ -r ${BASELINE_REPO} \
+ -b ${BASELINE_BRANCH} \
+ -p ${BENCHMARK_REPO} \
+ -e ${BENCHMARK_BRANCH} \
+ -o ${OUTPUT}/baseline \
+ -m "${METADATA}" \
+ -- "$@"
+fi
+
if [[ -z "${VERSION}" ]]; then
./run_tests.sh \
-t ${TAG} \
@@ -176,26 +195,6 @@
-- "$@"
fi
-if [[ -z "${BASELINE_BRANCH}" ]]; then
- ./run_tests.sh \
- -t ${TAG} \
- -v ${BASELINE_VERSION} \
- -p ${BENCHMARK_REPO} \
- -e ${BENCHMARK_BRANCH} \
- -o ${OUTPUT}/baseline \
- -m "${METADATA}" \
- -- "$@"
-else
- ./run_tests.sh \
- -t ${TAG} \
- -r ${BASELINE_REPO} \
- -b ${BASELINE_BRANCH} \
- -p ${BENCHMARK_REPO} \
- -e ${BENCHMARK_BRANCH} \
- -o ${OUTPUT}/baseline \
- -m "${METADATA}" \
- -- "$@"
-fi
set +x
./analyze_tests.sh ${OUTPUT}
diff --git a/infrastructure/scripts/aws/run_on_cluster.sh b/infrastructure/scripts/aws/run_on_cluster.sh
index f1ffdf6..b959221 100755
--- a/infrastructure/scripts/aws/run_on_cluster.sh
+++ b/infrastructure/scripts/aws/run_on_cluster.sh
@@ -24,7 +24,7 @@
REPO='https://github.com/apache/geode'
-while :; do
+while (( "$#" )); do
case $1 in
-t|--tag )
if [ "$2" ]; then
@@ -50,10 +50,8 @@
;;
-?* )
printf 'Invalid option: %s\n' "$1" >&2
- break
+ exit 1
;;
- * )
- break
esac
shift
done
diff --git a/infrastructure/scripts/aws/run_tests.sh b/infrastructure/scripts/aws/run_tests.sh
index 88eec9c..93d130e 100755
--- a/infrastructure/scripts/aws/run_tests.sh
+++ b/infrastructure/scripts/aws/run_tests.sh
@@ -34,7 +34,7 @@
OUTPUT=
VERSION=
-while :; do
+while (( "$#" )); do
case $1 in
-t|--tag )
if [ "$2" ]; then
@@ -108,10 +108,8 @@
;;
-?* )
printf 'Invalid option: %s\n' "$1" >&2
- break
+ exit 1
;;
- * )
- break
esac
shift
done
@@ -195,7 +193,8 @@
ssh ${SSH_OPTIONS} geode@${FIRST_INSTANCE} \
rm -rf geode-benchmarks '&&' \
- git clone ${BENCHMARK_REPO} --branch ${BENCHMARK_BRANCH}
+ git clone ${BENCHMARK_REPO} '&&' \
+ cd geode-benchmarks '&&' git checkout ${BENCHMARK_BRANCH}
BENCHMARK_SHA=$(ssh ${SSH_OPTIONS} geode@${FIRST_INSTANCE} \
cd geode-benchmarks '&&' \
@@ -207,7 +206,7 @@
ssh ${SSH_OPTIONS} geode@${FIRST_INSTANCE} \
cd geode-benchmarks '&&' \
- ./gradlew -PgeodeVersion=${VERSION} benchmark -Phosts=${HOSTS} -Pmetadata="${METADATA}" "$@"
+ ./gradlew -PgeodeVersion=${VERSION} benchmark "-Phosts=${HOSTS}" "-Pmetadata=${METADATA}" "$@"
mkdir -p ${OUTPUT}
