From e924cf2ad53fa9d01d215991f335b477c1574b0e Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Tue, 18 Jun 2019 14:14:06 -0400 Subject: [PATCH] Clone e2e tests This commit ensures we clone e2e tests during testing instead of relying on the tests from vendor/. --- Makefile | 9 ++------- hack/e2e.sh | 12 ++++++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100755 hack/e2e.sh diff --git a/Makefile b/Makefile index 56f3b2f547..d0378efd19 100644 --- a/Makefile +++ b/Makefile @@ -111,13 +111,8 @@ k8s-e2e: ## Run k8s specific e2e test -args -v 5 -logtostderr true .PHONY: test-e2e -test-e2e: ## Run openshift specific e2e test - go test -timeout 60m \ - -v ./vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e \ - -kubeconfig $${KUBECONFIG:-~/.kube/config} \ - -machine-api-namespace $${NAMESPACE:-openshift-machine-api} \ - -ginkgo.v \ - -args -v 5 -logtostderr true +test-e2e: ## Run e2e tests + hack/e2e.sh .PHONY: lint diff --git a/hack/e2e.sh b/hack/e2e.sh new file mode 100755 index 0000000000..89c0ed6b7e --- /dev/null +++ b/hack/e2e.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -euo pipefail + +GOPATH="$(mktemp -d)" +export GOPATH + +ACTUATOR_PKG="github.com/openshift/cluster-api-actuator-pkg" + +go get -u -d "${ACTUATOR_PKG}/..." + +exec make --directory="${GOPATH}/src/${ACTUATOR_PKG}" test-e2e