DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow to use a custom k8s version in e2e tests

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-05-15 12:34:17 -04:00
parent 87b730d5fe
commit d32079e69c
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
3 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -12,13 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Running make run-in-docker allows the execution of a target
# using a container intead of running the command locally
ifeq (run-in-docker,$(firstword $(MAKECMDGOALS)))
RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
$(eval $(RUN_ARGS):;@:)
endif
.PHONY: all
all: all-container
@ -36,6 +29,7 @@ FOCUS ?= .*
E2E_NODES ?= 10
# slow test only if takes > 50s
SLOW_E2E_THRESHOLD ?= 50
K8S_VERSION ?= v1.14.1
ifeq ($(GOHOSTOS),darwin)
SED_I=sed -i ''
@ -59,12 +53,14 @@ QEMUVERSION = v4.0.0
BUSTED_ARGS =-v --pattern=_test
export ARCH
export DUMB_ARCH
export TAG
export PKG
export GOARCH
export GIT_COMMIT
export GOBUILD_FLAGS
export REPO_INFO
export BUSTED_ARGS
IMGNAME = nginx-ingress-controller
IMAGE = $(REGISTRY)/$(IMGNAME)
@ -252,7 +248,3 @@ misspell:
.PHONE: kind-e2e-test
kind-e2e-test:
test/e2e/run.sh
.PHONE: run-in-docker
run-in-docker:
# dummy target