Merge pull request #60 from ingvagabund/vendor-ginkgo-tests

Vendor ginkgo tests

Author: openshift-merge-robot

Gopkg.lock

@@ -8,36 +8,49 @@ required = [
   "k8s.io/code-generator/cmd/informer-gen",
   "k8s.io/code-generator/cmd/openapi-gen",
   "k8s.io/gengo/args",
+  "github.com/openshift/cluster-api-actuator-pkg/pkg/e2e",
+  "github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/actuators",
+  "github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/autoscaler",
+  "github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/infra",
+  "github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/operators",
+  "github.com/openshift/api/config/v1",
+  "github.com/onsi/ginkgo",
+  "github.com/onsi/gomega",
 ]
 
+# To override the branch="master" constraint from cluster-api-actuator-pkg
+# for github.com/openshift/cluster-autoscaler-operator
+[[override]]
+  name = "github.com/openshift/cluster-autoscaler-operator"
+
 [[override]]
   name = "k8s.io/code-generator"
-  # revision for tag "kubernetes-1.11.2"
-  revision = "6702109cc68eb6fe6350b83e14407c8d7309fd1a"
+  version = "kubernetes-1.12.5"
 
 [[override]]
   name = "k8s.io/api"
-  # revision for tag "kubernetes-1.11.2"
-  revision = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"
+  version = "kubernetes-1.12.5"
 
 [[override]]
   name = "k8s.io/apiextensions-apiserver"
-  # revision for tag "kubernetes-1.11.2"
-  revision = "408db4a50408e2149acbd657bceb2480c13cb0a4"
+  version = "kubernetes-1.12.5"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  # revision for tag "kubernetes-1.11.2"
-  revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"
+  version = "kubernetes-1.12.5"
 
 [[override]]
   name = "k8s.io/client-go"
-  # revision for tag "kubernetes-1.11.2"
-  revision = "1f13a808da65775f22cbf47862c4e5898d8f4ca1"
+  version = "kubernetes-1.12.5"
+
+[[override]]
+  name = "k8s.io/kube-aggregator"
+  branch = "release-1.12"
 
 [[override]]
   name = "sigs.k8s.io/controller-runtime"
-  version = "v0.1.4"
+  # version = "v0.1.8" # does not work, still pulls v.1.10 instead
+  revision = "c63ebda0bf4be5f0a8abd4003e4ea546032545ba"
 
 [[override]]
   name = "github.com/openshift/api"
@@ -51,6 +64,12 @@ required = [
   name = "github.com/openshift/cluster-version-operator"
   branch = "master"
 
+# For dependency below: Refer to issue https://github.com/golang/dep/issues/1799
+[[override]]
+  name = "gopkg.in/fsnotify.v1"
+  source = "https://github.com/fsnotify/fsnotify.git"
+  version="v1.4.7"
+
 [prune]
   go-tests = true
   non-go = true
@@ -59,6 +78,10 @@ required = [
     name = "k8s.io/code-generator"
     non-go = false
 
+  [[prune.project]]
+    name = "github.com/openshift/cluster-api-actuator-pkg"
+    go-tests = false
+
 [[constraint]]
   branch = "master"
   name = "github.com/golang/glog"

Gopkg.toml

@@ -76,7 +76,12 @@ test: ## Run unit tests
 
 .PHONY: test-e2e
 test-e2e: ## Run e2e tests
-	 go run ./test/e2e/*.go -alsologtostderr $${NAMESPACE:+--namespace=$${NAMESPACE}} $${FOCUS:+--focus=$${FOCUS}}
+	go test -timeout 60m \
+		-v $(REPO_PATH)/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
 
 .PHONY: lint
 lint: ## Go lint your code