github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-05 19:21:37 +00:00
Code Issues Projects Releases Wiki Activity

Standardize how we refer to the kubernetes root.

Browse Source 
Now use $KUBE_ROOT as the variable pretty much everywhere.
This commit is contained in:
Joe Beda
2014-10-03 14:58:49 -07:00
parent 38d5906044
commit d43a6ec5a3
42 changed files with 172 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hack/e2e-test.sh
View File

@@ -19,14 +19,14 @@
# Use testing config
export KUBE_CONFIG_FILE="config-test.sh"
export KUBE_REPO_ROOT="$(dirname $0)/.."
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
# TODO(jbeda): This will break on usage if there is a space in
# ${KUBE_REPO_ROOT}. Covert to an array? Or an exported function?
export KUBECFG="${KUBE_REPO_ROOT}/cluster/kubecfg.sh -expect_version_match"
# ${KUBE_ROOT}. Covert to an array? Or an exported function?
export KUBECFG="${KUBE_ROOT}/cluster/kubecfg.sh -expect_version_match"
source $(dirname $0)/../cluster/kube-env.sh
source $(dirname $0)/../cluster/$KUBERNETES_PROVIDER/util.sh
source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/$KUBERNETES_PROVIDER/util.sh"
# For debugging of this test's components, it's helpful to leave the test
# cluster running.
@@ -48,10 +48,10 @@ test-build-release
if [[ ${ALREADY_UP} -ne 1 ]]; then
# Now bring a test cluster up with that release.
$(dirname $0)/../cluster/kube-up.sh
"${KUBE_ROOT}/cluster/kube-up.sh"
else
# Just push instead
$(dirname $0)/../cluster/kube-push.sh
"${KUBE_ROOT}/cluster/kube-push.sh"
fi
# Perform any required setup of the cluster
@@ -64,8 +64,8 @@ if [[ ${LEAVE_UP} -ne 1 ]]; then
fi
any_failed=0
for test_file in $(ls $(dirname $0)/e2e-suite/); do
"$(dirname $0)/e2e-suite/${test_file}"
for test_file in $(ls "${KUBE_ROOT}/hack/e2e-suite/"); do
"${KUBE_ROOT}/hack/e2e-suite/${test_file}"
result="$?"
if [[ "${result}" -eq "0" ]]; then
echo "${test_file} returned ${result}; passed!"