Merge pull request #2419 from r2d4/int-test-fix

Integration test fixes

hack/jenkins/common.sh

@@ -64,7 +64,7 @@ virsh -c qemu:///system list --all \
 vboxmanage list vms \
       | cut -d "{" -f2 \
       | cut -d "}" -f1 \
-      | xargs -I {} sh -c "vboxmanage unregistervm {} --delete" \
+      | xargs -I {} sh -c "vboxmanage startvm {} --type emergencystop && vboxmanage unregistervm {} --delete" \
       || true
 
 # Clean up xhyve disks

hack/jenkins/windows_integration_test_virtualbox.ps1

@@ -19,9 +19,8 @@ gsutil.cmd cp gs://minikube-builds/$env:MINIKUBE_LOCATION/e2e-windows-amd64.exe
 gsutil.cmd cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata .
 
 ./out/minikube-windows-amd64.exe delete
-Remove-Item -Recurse -Force C:\Users\jenkins\.minikube
 
-out/e2e-windows-amd64.exe -minikube-start-args="--vm-driver=virtualbox --kubernetes-version=https://storage.googleapis.com/minikube-builds/$env:MINIKUBE_LOCATION/localkube" -minikube-args="--v=10 --logtostderr" -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=30m
+out/e2e-windows-amd64.exe -minikube-start-args="--vm-driver=virtualbox --kubernetes-version=file:///var/jenkins/workspace/Windows_Integration_Tests_hyperv/out/localkube" -minikube-args="--v=10 --logtostderr" -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=30m
 $env:result=$lastexitcode
 # If the last exit code was 0->success, x>0->error
 If($env:result -eq 0){$env:status="success"}

hack/jenkins/windows_integration_test_virtualbox_kubeadm_crio.ps1

@@ -19,7 +19,6 @@ gsutil.cmd cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata .
 
 
 ./out/minikube-windows-amd64.exe delete
-Remove-Item -Recurse -Force C:\Users\jenkins\.minikube
 
 out/e2e-windows-amd64.exe --% -minikube-start-args="--vm-driver=virtualbox --container-runtime=cri-o" -minikube-args="--v=10 --logtostderr --bootstrapper=kubeadm" -test.v -test.timeout=30m -binary=out/minikube-windows-amd64.exe