Merge pull request kubernetes#30680 from wojtek-t/fix_leak_resources

Automatic merge from submit-queue Check resource leaks only when needed @fejta Broken by kubernetes#28575
lavalamp · Aug 16, 2016 · a594dcb · a594dcb
2 parents 73de6f4 + 992f023
commit a594dcb
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/hack/jenkins/e2e-runner.sh b/hack/jenkins/e2e-runner.sh
@@ -361,11 +361,13 @@ e2e_go_args=( \
 )
 
 
-case "${KUBERNETES_PROVIDER}" in
-  gce|gke)
-    e2e_go_args+=(--check_leaked_resources)
-    ;;
-esac
+if [[ "${FAIL_ON_GCP_RESOURCE_LEAK:-true}" == "true" ]]; then
+  case "${KUBERNETES_PROVIDER}" in
+    gce|gke)
+      e2e_go_args+=(--check_leaked_resources)
+      ;;
+  esac
+fi
 
 if [[ "${E2E_UP,,}" == "true" ]]; then
   e2e_go_args+=(--up --ctl="version --match-server-version=false")