Unverified Commit 17cba4e8 authored by Archit Sharma's avatar Archit Sharma Committed by GitHub
Browse files

shell checks: double quote expansion fixes (#1777)

Signed-off-by: default avatararcolife <archit.py@gmail.com>
parent 36820109
Showing with 8 additions and 8 deletions
+8 -8
...@@ -333,4 +333,4 @@ if [ -n "${ARTIFACTS}" -a -z "$SKIP_DUMP" ]; then ...@@ -333,4 +333,4 @@ if [ -n "${ARTIFACTS}" -a -z "$SKIP_DUMP" ]; then
fi fi
echo "info: run 'kubetest2 ${kubetest2_args[@]} -- hack/run-e2e.sh $@'" echo "info: run 'kubetest2 ${kubetest2_args[@]} -- hack/run-e2e.sh $@'"
$KUBETSTS2_BIN ${kubetest2_args[@]} -- hack/run-e2e.sh "$@" $KUBETSTS2_BIN "${kubetest2_args[@]}" -- hack/run-e2e.sh "$@"
...@@ -117,7 +117,7 @@ images=( ...@@ -117,7 +117,7 @@ images=(
$DOCKER_REGISTRY_PREFIX/pingcap/chaos-dashboard:${IMAGE_TAG} $DOCKER_REGISTRY_PREFIX/pingcap/chaos-dashboard:${IMAGE_TAG}
$DOCKER_REGISTRY_PREFIX/pingcap/chaos-daemon:${IMAGE_TAG} $DOCKER_REGISTRY_PREFIX/pingcap/chaos-daemon:${IMAGE_TAG}
) )
for n in ${images[@]}; do for n in "${images[@]}"; do
echo "info: loading image $n" echo "info: loading image $n"
$KIND_BIN load docker-image --name $CLUSTER $n $KIND_BIN load docker-image --name $CLUSTER $n
done done
......
...@@ -73,8 +73,8 @@ function e2e::image_load() { ...@@ -73,8 +73,8 @@ function e2e::image_load() {
local nodes=$($KIND_BIN get nodes --name $CLUSTER | grep -v 'control-plane$') local nodes=$($KIND_BIN get nodes --name $CLUSTER | grep -v 'control-plane$')
echo $nodes echo $nodes
echo "info: load images ${images[@]}" echo "info: load images ${images[@]}"
for image in ${images[@]}; do for image in "${images[@]}"; do
$KIND_BIN load docker-image --name $CLUSTER ${DOCKER_REGISTRY}/$image:$IMAGE_TAG --nodes $(hack::join ',' ${nodes[@]}) $KIND_BIN load docker-image --name $CLUSTER ${DOCKER_REGISTRY}/$image:$IMAGE_TAG --nodes $(hack::join ',' "${nodes[@]}")
done done
# bypassing docker pull rate limit inner the kind container: kindest/node has no credentials # bypassing docker pull rate limit inner the kind container: kindest/node has no credentials
...@@ -84,9 +84,9 @@ function e2e::image_load() { ...@@ -84,9 +84,9 @@ function e2e::image_load() {
docker pull pingcap/coredns:v0.2.0 docker pull pingcap/coredns:v0.2.0
docker pull nginx:latest docker pull nginx:latest
docker pull gcr.io/google-containers/pause:latest docker pull gcr.io/google-containers/pause:latest
$KIND_BIN load docker-image --name $CLUSTER pingcap/coredns:v0.2.0 --nodes $(hack::join ',' ${nodes[@]}) $KIND_BIN load docker-image --name $CLUSTER pingcap/coredns:v0.2.0 --nodes $(hack::join ',' "${nodes[@]}")
$KIND_BIN load docker-image --name $CLUSTER nginx:latest --nodes $(hack::join ',' ${nodes[@]}) $KIND_BIN load docker-image --name $CLUSTER nginx:latest --nodes $(hack::join ',' "${nodes[@]}")
$KIND_BIN load docker-image --name $CLUSTER gcr.io/google-containers/pause:latest --nodes $(hack::join ',' ${nodes[@]}) $KIND_BIN load docker-image --name $CLUSTER gcr.io/google-containers/pause:latest --nodes $(hack::join ',' "${nodes[@]}")
fi fi
} }
...@@ -177,4 +177,4 @@ if [ -n "$REPORT_DIR" ]; then ...@@ -177,4 +177,4 @@ if [ -n "$REPORT_DIR" ]; then
fi fi
echo "info: docker ${docker_args[@]} $E2E_IMAGE ${e2e_args[@]}" echo "info: docker ${docker_args[@]} $E2E_IMAGE ${e2e_args[@]}"
docker ${docker_args[@]} $E2E_IMAGE ${e2e_args[@]} docker "${docker_args[@]}" $E2E_IMAGE "${e2e_args[@]}"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment