Skip to content

Commit

Permalink
Clone e2e tests
Browse files Browse the repository at this point in the history
This commit ensures we clone e2e tests during testing
instead of relying on the tests from vendor/.
  • Loading branch information
michaelgugino committed Jun 18, 2019
1 parent b5c07dd commit e924cf2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions hack/e2e.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit e924cf2

Please sign in to comment.