Skip to content

Commit 46f4852

Browse files
Merge pull request #168 from enxebre/e2e-pkg
E2e pkg
2 parents 7a541ff + 3882509 commit 46f4852

File tree

510 files changed

+126849
-792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

510 files changed

+126849
-792
lines changed

Gopkg.lock

Lines changed: 45 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ required = [
1313
"sigs.k8s.io/controller-runtime/pkg/source",
1414
"sigs.k8s.io/testing_frameworks/integration", # for integration testing
1515
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1",
16+
"github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/openshift"
1617
]
1718

1819
[prune]
@@ -22,10 +23,6 @@ required = [
2223
name = "github.com/aws/aws-sdk-go"
2324
version = "v1.15.5"
2425

25-
[[constraint]]
26-
name = "github.com/openshift/cluster-api-actuator-pkg"
27-
branch = "master"
28-
2926
[[override]]
3027
name = "k8s.io/kube-aggregator"
3128
version = "kubernetes-1.12.5"
@@ -63,6 +60,11 @@ required = [
6360
name="sigs.k8s.io/controller-tools"
6461
version="v0.1.1"
6562

63+
64+
[[constraint]]
65+
name = "github.com/openshift/cluster-api-actuator-pkg"
66+
revision = "2620fd63480ea1155c71de87a022f1f564f09ff2"
67+
6668
# For dependency below: Refer to issue https://github.com/golang/dep/issues/1799
6769
[[override]]
6870
name = "gopkg.in/fsnotify.v1"

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ k8s-e2e: ## Run k8s specific e2e test
103103
-args -v 5 -logtostderr true
104104

105105
.PHONY: test-e2e
106-
test-e2e: ## Run e2e validation/gating test
107-
go run ./test/e2e/*.go -alsologtostderr
106+
test-e2e:
107+
go run ./vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/openshift/*.go -alsologtostderr
108108

109109
.PHONY: lint
110110
lint: ## Go lint your code

test/e2e/main.go

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)