diff --git a/Makefile b/Makefile index a197ca8dc7..e8aacb1490 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ BUILD_DATE?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") LDFLAGS?="-X ${PKG}/pkg/driver.driverVersion=${VERSION} -X ${PKG}/pkg/driver.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/driver.buildDate=${BUILD_DATE} -s -w" GO111MODULE=on GOPROXY=direct +GOPATH=$(shell go env GOPATH) .EXPORT_ALL_VARIABLES: @@ -40,18 +41,22 @@ test: test-sanity: go test -v ./tests/sanity/... +.PHONY: tester +tester: + go get github.com/aws/aws-k8s-tester/e2e/tester/cmd/k8s-e2e-tester@main + .PHONY: test-integration test-integration: #./hack/run-integration-test echo "succeed" .PHONY: test-e2e-single-az -test-e2e-single-az: - TESTCONFIG=./tester/single-az-config.yaml go run tester/cmd/main.go +test-e2e-single-az: tester + TESTCONFIG=./tester/single-az-config.yaml ${GOPATH}/bin/k8s-e2e-tester .PHONY: test-e2e-multi-az -test-e2e-multi-az: - TESTCONFIG=./tester/multi-az-config.yaml go run tester/cmd/main.go +test-e2e-multi-az: tester + TESTCONFIG=./tester/multi-az-config.yaml ${GOPATH}/bin/k8s-e2e-tester .PHONY: test-e2e-migration test-e2e-migration: diff --git a/go.mod b/go.mod index 93115f0892..deba034154 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/kubernetes-sigs/aws-ebs-csi-driver require ( - github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20190907061006-260b0e114d90 + github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191203073900-e5a28058b567 // indirect github.com/aws/aws-sdk-go v1.23.21 github.com/container-storage-interface/spec v1.1.0 github.com/coreos/go-semver v0.2.0 // indirect @@ -86,3 +86,5 @@ replace ( k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190805143616-1485e5142db3 k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190805142825-b16fad786282 ) + +go 1.13 diff --git a/go.sum b/go.sum index ffb7116bba..b9784bafc6 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,11 @@ github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkF github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM= +github.com/aws/aws-k8s-tester v0.4.5-0.20191203073900-e5a28058b567 h1:tzabayjAiOaNO1nEoy+Fj9JHs1X3+LYqrRHbJRfVwqg= github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20190907061006-260b0e114d90 h1:FRpHLOVjM/FO/sl84ilNQWATtRd1FR6uk7UUs8MUl5Y= github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20190907061006-260b0e114d90/go.mod h1:xCa3ZGICI7/IqtJdYjEsM3QL9vwlLHxgwSA/MD09Zgo= +github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191203073900-e5a28058b567 h1:6zSO87AbCbY3doj1VEaqIs9Z81QxzNX0LWF7o2P6liU= +github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191203073900-e5a28058b567/go.mod h1:DJkIJa8BA0LCJWjl01jsEl8vm/fjei0uWJFzZol0KUI= github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.23.21 h1:eVJT2C99cAjZlBY8+CJovf6AwrSANzAcYNuxdCB+SPk= github.com/aws/aws-sdk-go v1.23.21/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= diff --git a/tester/cmd/main.go b/tester/cmd/main.go deleted file mode 100644 index 8e4a255d6b..0000000000 --- a/tester/cmd/main.go +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2019 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package main - -import ( - "github.com/aws/aws-k8s-tester/e2e/tester" -) - -func main() { - tester.Start() -}