github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

hack: Switch some $(dirname $0)../blah to use ${KUBE_*} vars

Browse Source 
This doesn't fix anything broken. But we have config-go which exports
KUBE_REPO_ROOT and KUBE_TARGET.  Using those means the test scripts can
be more easily moved around the repo and still work.  Especially in
hack/test-integration.sh where we use hack/build-go.sh which is going
to use KUBE_TARGET to place the binary, then we use a different method
to find/execute the binary...
This commit is contained in:
Eric Paris 2014-09-23 10:08:46 -04:00
parent bab5082a85
commit 3a40db8f56
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/test-cmd.sh
View File

@ -18,6 +18,7 @@
# simple scenarios. It does not require Docker so it can run in travis. # simple scenarios. It does not require Docker so it can run in travis.
source $(dirname $0)/util.sh source $(dirname $0)/util.sh
source $(dirname $0)/config-go.sh
function cleanup() function cleanup()
{ {
@ -44,7 +45,7 @@ ETCD_PORT=${ETCD_PORT:-4001}
API_PORT=${API_PORT:-8080} API_PORT=${API_PORT:-8080}
API_HOST=${API_HOST:-127.0.0.1} API_HOST=${API_HOST:-127.0.0.1}
KUBELET_PORT=${KUBELET_PORT:-10250} KUBELET_PORT=${KUBELET_PORT:-10250}
GO_OUT=$(dirname $0)/../_output/go/bin GO_OUT=${KUBE_TARGET}/bin
# Check kubecfg # Check kubecfg
out=$(${GO_OUT}/kubecfg -version) out=$(${GO_OUT}/kubecfg -version)

5
hack/test-integration.sh
View File

@ -15,6 +15,7 @@
# limitations under the License. # limitations under the License.
source $(dirname $0)/util.sh source $(dirname $0)/util.sh
source $(dirname $0)/config-go.sh
function cleanup() function cleanup()
{ {
@ -37,14 +38,14 @@ echo
echo Integration test cases ... echo Integration test cases ...
echo echo
GOFLAGS="-tags 'integration no-docker'" \ GOFLAGS="-tags 'integration no-docker'" \
$(dirname $0)/../hack/test-go.sh test/integration ${KUBE_REPO_ROOT}/hack/test-go.sh test/integration
# leave etcd running if integration tests fail # leave etcd running if integration tests fail
trap "echo etcd still running" EXIT trap "echo etcd still running" EXIT
echo echo
echo Integration scenario ... echo Integration scenario ...
echo echo
$(dirname $0)/../_output/go/bin/integration ${KUBE_TARGET}/bin/integration
# nuke etcd # nuke etcd
trap cleanup EXIT SIGINT trap cleanup EXIT SIGINT