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

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

View File

@@ -15,6 +15,7 @@
# limitations under the License.
source $(dirname $0)/util.sh
source $(dirname $0)/config-go.sh
function cleanup()
{
@@ -37,14 +38,14 @@ echo
echo Integration test cases ...
echo
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
trap "echo etcd still running" EXIT
echo
echo Integration scenario ...
echo
$(dirname $0)/../_output/go/bin/integration
${KUBE_TARGET}/bin/integration
# nuke etcd
trap cleanup EXIT SIGINT