github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-06 03:33:26 +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

11
hack/test-integration.sh
View File

@@ -18,10 +18,9 @@ set -o errexit
set -o nounset
set -o pipefail
basedir=$(dirname "$0")
source "${basedir}/config-go.sh"
source "${KUBE_REPO_ROOT}/hack/util.sh"
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/config-go.sh"
source "${KUBE_ROOT}/hack/util.sh"
cleanup() {
kill "${ETCD_PID-}" >/dev/null 2>&1 || :
@@ -31,7 +30,7 @@ cleanup() {
}
if [[ "${KUBE_NO_BUILD_INTEGRATION+set}" != "set" ]]; then
"${KUBE_REPO_ROOT}/hack/build-go.sh" cmd/integration
"${KUBE_ROOT}/hack/build-go.sh" cmd/integration
fi
# Run cleanup to stop etcd on interrupt or other kill signal.
@@ -43,7 +42,7 @@ echo ""
echo "Integration test cases..."
echo ""
GOFLAGS="-tags 'integration no-docker'" \
"${KUBE_REPO_ROOT}/hack/test-go.sh" test/integration
"${KUBE_ROOT}/hack/test-go.sh" test/integration
echo ""
echo "Integration scenario ..."