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

added debug to trace testgrid fail & suppressed breaking warning for kubectl version (#8561)

Browse source
This commit is contained in:
Long Wu Yuan 2022-05-08 16:57:18 +05:30 committed by GitHub
parent 730b7408ca
commit 415305d47b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/dev-env.sh
View file

@ -51,7 +51,7 @@ if [[ ${HELM_VERSION} < "v3.0.0" ]]; then
exit 1 exit 1
fi fi
KUBE_CLIENT_VERSION=$(kubectl version --client --short | awk '{print $3}' | cut -d. -f2) || true KUBE_CLIENT_VERSION=$(kubectl version --client --short 2>/dev/null | grep Client | awk '{print $3}' | cut -d. -f2) || true
if [[ ${KUBE_CLIENT_VERSION} -lt 14 ]]; then if [[ ${KUBE_CLIENT_VERSION} -lt 14 ]]; then
echo "Please update kubectl to 1.15 or higher" echo "Please update kubectl to 1.15 or higher"
exit 1 exit 1

3
test/e2e-image/Makefile
View file

@ -2,7 +2,10 @@
DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
image: image:
echo "..entered Makefile in /test/e2e-image"
echo "..calling Make target <<e2e-test-binar>>y in /Makefile from inside /test/e2e-image/Makefile"
make -C $(DIR)/../../ e2e-test-binary make -C $(DIR)/../../ e2e-test-binary
echo "..done building e2e-test-binary from /test/e2e-image/Makefile"
cp $(DIR)/../e2e/e2e.test . cp $(DIR)/../e2e/e2e.test .
cp $(DIR)/../e2e/wait-for-nginx.sh . cp $(DIR)/../e2e/wait-for-nginx.sh .