Flip to github.com/openshift/cluster-api-actuator-pkg

openshift · Oct 12, 2018 · cdb9df6 · cdb9df6
1 parent 2101111
commit cdb9df6
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 1,685 deletions.
diff --git a/Makefile b/Makefile
@@ -76,7 +76,7 @@ integration: ## Run integration test
 
 .PHONY: test-e2e
 test-e2e: ## Run e2e test
-	go test -timeout 20m -v sigs.k8s.io/cluster-api-provider-aws/test/machines -kubeconfig $${KUBECONFIG:-~/.kube/config} -ssh-key $${SSH_PK:-~/.ssh/id_rsa} -cluster-id $${ENVIRONMENT_ID:-""} -ginkgo.v
+	go test -timeout 20m -v sigs.k8s.io/cluster-api-provider-aws/test/machines -kubeconfig $${KUBECONFIG:-~/.kube/config} -ssh-key $${SSH_PK:-~/.ssh/id_rsa} -actuator-image $${ACTUATOR_IMAGE:-gcr.io/k8s-cluster-api/aws-machine-controller:0.0.1} -cluster-id $${ENVIRONMENT_ID:-""} -ginkgo.v
 
 .PHONY: lint
 lint: ## Go lint your code

diff --git a/test/framework/clusterapi.go b/test/framework/clusterapi.go
diff --git a/test/framework/clusters.go b/test/framework/clusters.go