github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix shellcheck lint errors in test/kubemark/run-e2e-tests.sh

Browse Source
This commit is contained in:
Bob Killen 2019-02-04 18:20:32 -06:00
parent adf4bf1741
commit 46333a01b4
No known key found for this signature in database
GPG Key ID: 03FB8A8615239E6D
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.shellcheck_failures
View File

@ -145,7 +145,6 @@
./test/images/volume/rbd/create_block.sh ./test/images/volume/rbd/create_block.sh
./test/images/volume/rbd/mon.sh ./test/images/volume/rbd/mon.sh
./test/images/volume/rbd/osd.sh ./test/images/volume/rbd/osd.sh
./test/kubemark/run-e2e-tests.sh
./test/kubemark/start-kubemark.sh ./test/kubemark/start-kubemark.sh
./test/kubemark/stop-kubemark.sh ./test/kubemark/stop-kubemark.sh
./third_party/forked/shell2junit/sh2ju.sh ./third_party/forked/shell2junit/sh2ju.sh

20
test/kubemark/run-e2e-tests.sh
View File

@ -17,10 +17,10 @@
export KUBERNETES_PROVIDER="kubemark" export KUBERNETES_PROVIDER="kubemark"
export KUBE_CONFIG_FILE="config-default.sh" export KUBE_CONFIG_FILE="config-default.sh"
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
# We need an absolute path to KUBE_ROOT # We need an absolute path to KUBE_ROOT
ABSOLUTE_ROOT=$(readlink -f ${KUBE_ROOT}) ABSOLUTE_ROOT=$(readlink -f "${KUBE_ROOT}")
source "${KUBE_ROOT}/cluster/kubemark/util.sh" source "${KUBE_ROOT}/cluster/kubemark/util.sh"
@ -32,21 +32,23 @@ export KUBE_MASTER_URL="https://${KUBE_MASTER_IP}"
export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/resources/kubeconfig.kubemark" export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/resources/kubeconfig.kubemark"
export E2E_MIN_STARTUP_PODS=0 export E2E_MIN_STARTUP_PODS=0
if [[ -z "$@" ]]; then if [[ -z "$*" ]]; then
ARGS='--ginkgo.focus=[Feature:Performance]' ARGS=('--ginkgo.focus=[Feature:Performance]')
else else
ARGS=$@ ARGS=("$@")
fi fi
if [[ "${ENABLE_KUBEMARK_CLUSTER_AUTOSCALER}" == "true" ]]; then if [[ "${ENABLE_KUBEMARK_CLUSTER_AUTOSCALER}" == "true" ]]; then
ARGS="${ARGS} --kubemark-external-kubeconfig=${DEFAULT_KUBECONFIG}" ARGS+=("--kubemark-external-kubeconfig=${DEFAULT_KUBECONFIG}")
fi fi
if [[ -f /.dockerenv ]]; then if [[ -f /.dockerenv ]]; then
# Running inside a dockerized runner. # Running inside a dockerized runner.
go run ./hack/e2e.go -- --check-version-skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS}" go run ./hack/e2e.go -- --check-version-skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS[*]}"
else else
# Running locally. # Running locally.
ARGS=$(echo $ARGS | sed 's/\[/\\\[/g' | sed 's/\]/\\\]/g') for ((i=0; i < ${ARGS[@]}; i++)); do
${KUBE_ROOT}/hack/ginkgo-e2e.sh "--e2e-verify-service-account=false" "--dump-logs-on-failure=false" $ARGS ARGS[$i]="$(echo "ARGS[$i]" | sed -e 's/\[/\\\[/g' -e 's/\]/\\\]/g' )"
done
"${KUBE_ROOT}/hack/ginkgo-e2e.sh" "--e2e-verify-service-account=false" "--dump-logs-on-failure=false" "${ARGS[@]}"
fi fi