From 5a1c6b6c0221076ab6a587a73d26ca49387a34a8 Mon Sep 17 00:00:00 2001 From: Mateusz Matejczyk Date: Sun, 24 Nov 2019 08:32:27 -1000 Subject: [PATCH] Revert "remove redundant `source` in shell" This reverts commit 197964210ac3f02757b9a1cfa4898283274076fc. It breaks all kubemark periodic tests - https://k8s-testgrid.appspot.com/sig-scalability-kubemark Example failure (https://prow.k8s.io/view/gcs/kubernetes-jenkins/logs/ci-kubernetes-kubemark-100-gce/1198635036526514177): ``` W1124 16:20:35.524] ./test/kubemark/start-kubemark.sh: line 27: CLOUD_PROVIDER: unbound variable ``` --- test/kubemark/start-kubemark.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh index d95dcc2c9af..de5505f1953 100755 --- a/test/kubemark/start-kubemark.sh +++ b/test/kubemark/start-kubemark.sh @@ -24,7 +24,9 @@ TMP_ROOT="$(dirname "${BASH_SOURCE[@]}")/../.." KUBE_ROOT=$(readlink -e "${TMP_ROOT}" 2> /dev/null || perl -MCwd -e 'print Cwd::abs_path shift' "${TMP_ROOT}") source "${KUBE_ROOT}/test/kubemark/skeleton/util.sh" +source "${KUBE_ROOT}/test/kubemark/cloud-provider-config.sh" source "${KUBE_ROOT}/test/kubemark/${CLOUD_PROVIDER}/util.sh" +source "${KUBE_ROOT}/cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh" if [[ -f "${KUBE_ROOT}/test/kubemark/${CLOUD_PROVIDER}/startup.sh" ]] ; then source "${KUBE_ROOT}/test/kubemark/${CLOUD_PROVIDER}/startup.sh"