From eaf6c9248d4a2d290b3f0174a75bf7849059c53e Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 5 Dec 2018 15:13:48 -0800
Subject: [PATCH] Explicitly call tunnel --cleanup, use ip route on Linux

---
 hack/jenkins/common.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index f8f3b94ae..2bda885f3 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -96,9 +96,9 @@ for stale_dir in ${TEST_ROOT}/*; do
   export KUBECONFIG="${stale_dir}/kubeconfig"
 
   if [[ -d "${MINIKUBE_HOME}" ]]; then
-    if [[ -f "${MINIKUBE_HOME}/tunnels.json" ]]; then
-      echo "Stale tunnels.json:"
+    if [[ -r "${MINIKUBE_HOME}/tunnels.json" ]]; then
       cat "${MINIKUBE_HOME}/tunnels.json"
+      ${MINIKUBE_BIN} tunnel --clean || true
     fi
     echo "Shutting down stale minikube instance ..."
     if [[ -w "${MINIKUBE_HOME}" ]]; then
@@ -166,7 +166,11 @@ function cleanup_stale_routes() {
   if [[ "${stale_routes}" != "" ]]; then
     echo "WARNING: deleting stale tunnel routes: ${stale_routes}"
     for route in ${stale_routes}; do
-      sudo route -n delete "${route}" || true
+      if [[ "$(uname)" == "Linux" ]]; then
+        sudo ip route delete "${route}" || true
+      else
+        sudo route -n delete "${route}" || true
+      fi
     done
   fi
 }
@@ -202,7 +206,8 @@ else
 fi
 
 echo ">> Cleaning up after ourselves ..."
-${SUDO_PREFIX}${MINIKUBE_BIN} delete >/dev/null 2>/dev/null || true
+${SUDO_PREFIX}${MINIKUBE_BIN} tunnel --clean >/dev/null 2>/dev/null || true
+${SUDO_PREFIX}${MINIKUBE_BIN} delete || true
 cleanup_stale_routes || true
 
 ${SUDO_PREFIX} rm -Rf "${MINIKUBE_HOME}" || true
-- 
GitLab