Merge pull request #9886 from sharifelgamal/hyperkit

reduce hyperkit tests to functional

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"
@@ -221,17 +221,17 @@ fi
 
 
 # clean up none drivers binding on 8443
-  none_procs=$(sudo lsof -i :8443 | tail -n +2 | awk '{print $2}' || true)
-  if [[ "${none_procs}" != "" ]]; then
-    echo "Found stale api servers listening on 8443 processes to kill: "
-    for p in $none_procs
-    do
+none_procs=$(sudo lsof -i :8443 | tail -n +2 | awk '{print $2}' || true)
+if [[ "${none_procs}" != "" ]]; then
+  echo "Found stale api servers listening on 8443 processes to kill: "
+  for p in $none_procs
+  do
     echo "Kiling stale none driver:  $p"
     sudo -E ps -f -p $p || true
     sudo -E kill $p || true
     sudo -E kill -9 $p || true
-    done
-  fi
+  done
+fi
 
 function cleanup_stale_routes() {
   local show="netstat -rn -f inet"

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 "

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

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="--bootstrapper=kubeadm"
-EXTRA_START_ARGS=""
+EXTRA_TEST_ARGS="-test.run TestFunctional"
 EXPECTED_DEFAULT_DRIVER="hyperkit"
 
 

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"