Support $TAG and $ISTIOCTL_BIN overide in e2e tests (istio#9232)

249043822 · Oct 9, 2018 · 229583e · 229583e
1 parent b8ac13e
commit 229583e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/prow/e2e-suite.sh b/prow/e2e-suite.sh
@@ -84,7 +84,7 @@ if [ "${CI:-}" == 'bootstrap' ]; then
 fi
 
 export HUB=${HUB:-"gcr.io/istio-testing"}
-export TAG="${GIT_SHA}"
+export TAG="${TAG:-${GIT_SHA}}"
 
 make init
 

diff --git a/tests/istio.mk b/tests/istio.mk
@@ -48,8 +48,10 @@ E2E_TIMEOUT ?= 25
 # If set outside, it appears it is not possible to modify the variable.
 E2E_ARGS ?=
 
+ISTIOCTL_BIN ?= ${ISTIO_OUT}/istioctl
+
 DEFAULT_EXTRA_E2E_ARGS = ${MINIKUBE_FLAGS}
-DEFAULT_EXTRA_E2E_ARGS += --istioctl=${ISTIO_OUT}/istioctl
+DEFAULT_EXTRA_E2E_ARGS += --istioctl=${ISTIOCTL_BIN}
 DEFAULT_EXTRA_E2E_ARGS += --mixer_tag=${TAG}
 DEFAULT_EXTRA_E2E_ARGS += --pilot_tag=${TAG}
 DEFAULT_EXTRA_E2E_ARGS += --proxy_tag=${TAG}