From ebd936c3c2b7d6d90abf4e3f720445da93e6e372 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 19 Jan 2021 16:17:03 -0800
Subject: [PATCH] Add --container-runtime to extra start args if it is set

---
 hack/jenkins/common.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index e8f38379e0..57a9656b2b 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -300,8 +300,14 @@ if test -f "${TEST_OUT}"; then
   rm "${TEST_OUT}" || true # clean up previous runs of same build
 fi
 touch "${TEST_OUT}"
+
+if [ -z "${CONTAINER_RUNTIME}" ]
+then
+    EXTRA_START_ARGS="${EXTRA_START_ARGS} --container-runtime=${CONTAINER_RUNTIME}"
+fi
+
 ${SUDO_PREFIX}${E2E_BIN} \
-  -minikube-start-args="--driver=${VM_DRIVER} --container-runtime=${CONTAINER_RUNTIME} ${EXTRA_START_ARGS}" \
+  -minikube-start-args="--driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \
   -test.timeout=${TIMEOUT} -test.v \
   ${EXTRA_TEST_ARGS} \
   -binary="${MINIKUBE_BIN}" 2>&1 | tee "${TEST_OUT}"