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

Merge pull request #4069 from nicknovitski/make-e2e-fixes

Browse source 
fix e2e-test make target
This commit is contained in:
Kubernetes Prow Robot 2019-05-07 16:52:34 -07:00 committed by GitHub
commit 78d582c0fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -184,10 +184,11 @@ lua-test:
.PHONY: e2e-test .PHONY: e2e-test
e2e-test: e2e-test:
if [ "$(KUBECTL_CONTEXT)" != "minikube" ] && \ if [ "$(KUBECTL_CONTEXT)" != "minikube" ] && \
[ "$(KUBECTL_CONTEXT)" =~ .*kind* ] && \ ! echo $(KUBECTL_CONTEXT) | grep kind && \
! echo $(KUBECTL_CONTEXT) | grep ingress-nginx-dev && \
[ "$(KUBECTL_CONTEXT)" != "dind" ] && \ [ "$(KUBECTL_CONTEXT)" != "dind" ] && \
[ "$(KUBECTL_CONTEXT)" != "docker-for-desktop" ]; then \ [ "$(KUBECTL_CONTEXT)" != "docker-for-desktop" ]; then \
echo "kubectl context is "$(KUBECTL_CONTEXT)", but must be one of [minikube, *kind*, dind, docker-for-deskop]"; \ echo "kubectl context is "$(KUBECTL_CONTEXT)", but must be one of [minikube, *kind*, *ingress-nginx-dev*, dind, docker-for-deskop]"; \
exit 1; \ exit 1; \
fi fi
@ -199,6 +200,11 @@ e2e-test:
--user=kubelet \ --user=kubelet \
--serviceaccount=default:ingress-nginx-e2e || true --serviceaccount=default:ingress-nginx-e2e || true
until kubectl get secret | grep -q ^ingress-nginx-e2e-token; do \
echo "waiting for api token"; \
sleep 3; \
done
kubectl run --rm -i --tty \ kubectl run --rm -i --tty \
--attach \ --attach \
--restart=Never \ --restart=Never \