From aef091198a1da18f1226fbc06cce96abd41105a6 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 8 Dec 2020 16:18:12 -0800
Subject: [PATCH] fix up screwy env vars

---
 hack/jenkins/common.sh                           | 4 ++--
 hack/jenkins/linux_integration_tests_none.sh     | 2 +-
 hack/jenkins/linux_integration_tests_podman.sh   | 2 +-
 hack/jenkins/osx_integration_tests_hyperkit.sh   | 3 +--
 hack/jenkins/osx_integration_tests_virtualbox.sh | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index 16de6740f..7592218c2 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -21,7 +21,7 @@
 # OS_ARCH: The operating system and the architecture separated by a hyphen '-' (e.g. darwin-amd64, linux-amd64, windows-amd64)
 # VM_DRIVER: the driver to use for the test
 # EXTRA_START_ARGS: additional flags to pass into minikube start
-# EXTRA_ARGS: additional flags to pass into minikube
+# EXTRA_TEST_ARGS: additional flags to pass into go test
 # JOB_NAME: the name of the logfile and check name to update on github
 
 readonly TEST_ROOT="${HOME}/minikube-integration"
@@ -296,7 +296,7 @@ touch "${TEST_OUT}"
 ${SUDO_PREFIX}${E2E_BIN} \
   -minikube-start-args="--driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \
   -test.timeout=70m -test.v \
-  ${EXTRA_ARGS} \
+  ${EXTRA_TEST_ARGS} \
   -binary="${MINIKUBE_BIN}" 2>&1 | tee "${TEST_OUT}"
 
 result=${PIPESTATUS[0]} # capture the exit code of the first cmd in pipe.
diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh
index 0549fde50..ce36afee5 100755
--- a/hack/jenkins/linux_integration_tests_none.sh
+++ b/hack/jenkins/linux_integration_tests_none.sh
@@ -29,7 +29,7 @@ set -e
 OS_ARCH="linux-amd64"
 VM_DRIVER="none"
 JOB_NAME="none_Linux"
-EXTRA_ARGS="--bootstrapper=kubeadm"
+EXTRA_START_ARGS="--bootstrapper=kubeadm"
 EXPECTED_DEFAULT_DRIVER="kvm2"
 
 SUDO_PREFIX="sudo -E "
diff --git a/hack/jenkins/linux_integration_tests_podman.sh b/hack/jenkins/linux_integration_tests_podman.sh
index 3b61c1560..186e9e0a4 100755
--- a/hack/jenkins/linux_integration_tests_podman.sh
+++ b/hack/jenkins/linux_integration_tests_podman.sh
@@ -32,7 +32,7 @@ JOB_NAME="Experimental_Podman_Linux"
 mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
 sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
 
-EXTRA_ARGS="--container-runtime=containerd"
+EXTRA_START_ARGS="--container-runtime=containerd"
 
 # remove possible left over podman containers
 sudo podman rm -f -v $(sudo podman ps -aq) || true
diff --git a/hack/jenkins/osx_integration_tests_hyperkit.sh b/hack/jenkins/osx_integration_tests_hyperkit.sh
index a52329b75..f4e6726d7 100755
--- a/hack/jenkins/osx_integration_tests_hyperkit.sh
+++ b/hack/jenkins/osx_integration_tests_hyperkit.sh
@@ -29,8 +29,7 @@ set -e
 OS_ARCH="darwin-amd64"
 VM_DRIVER="hyperkit"
 JOB_NAME="HyperKit_macOS"
-EXTRA_ARGS="-test.run TestFunctional"
-EXTRA_START_ARGS=""
+EXTRA_TEST_ARGS="-test.run TestFunctional"
 EXPECTED_DEFAULT_DRIVER="hyperkit"
 
 
diff --git a/hack/jenkins/osx_integration_tests_virtualbox.sh b/hack/jenkins/osx_integration_tests_virtualbox.sh
index c897457e3..67505da50 100755
--- a/hack/jenkins/osx_integration_tests_virtualbox.sh
+++ b/hack/jenkins/osx_integration_tests_virtualbox.sh
@@ -28,7 +28,7 @@ set -e
 OS_ARCH="darwin-amd64"
 VM_DRIVER="virtualbox"
 JOB_NAME="VirtualBox_macOS"
-EXTRA_ARGS="--bootstrapper=kubeadm"
+EXTRA_START_ARGS="--bootstrapper=kubeadm"
 # hyperkit behaves better, so it has higher precedence.
 # Assumes that hyperkit is also installed on the VirtualBox CI host.
 EXPECTED_DEFAULT_DRIVER="hyperkit"
-- 
GitLab