mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-05 19:21:37 +00:00
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:
@@ -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
|
||||
|
Reference in New Issue
Block a user