From bdd937d36021389cf6b715bed2fc68f8ba26994e Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Wed, 23 Oct 2019 22:06:48 -0700 Subject: [PATCH] Adjust -expected-default-driver invocation --- hack/jenkins/common.sh | 4 +++- hack/jenkins/windows_integration_test_virtualbox.ps1 | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 613cee0e07..5121ed2f71 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -256,12 +256,14 @@ fi echo "" echo ">> Starting ${E2E_BIN} at $(date)" +set -x ${SUDO_PREFIX}${E2E_BIN} \ -minikube-start-args="--vm-driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \ - --expected-default-driver="${EXPECTED_DEFAULT_DRIVER}" \ + -expected-default-driver="${EXPECTED_DEFAULT_DRIVER}" \ -test.timeout=60m \ -test.parallel=${PARALLEL_COUNT} \ -binary="${MINIKUBE_BIN}" && result=$? || result=$? +set +x echo ">> ${E2E_BIN} exited with ${result} at $(date)" echo "" diff --git a/hack/jenkins/windows_integration_test_virtualbox.ps1 b/hack/jenkins/windows_integration_test_virtualbox.ps1 index 02cbe60ec1..86dfde120a 100644 --- a/hack/jenkins/windows_integration_test_virtualbox.ps1 +++ b/hack/jenkins/windows_integration_test_virtualbox.ps1 @@ -19,7 +19,7 @@ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata . ./out/minikube-windows-amd64.exe delete -out/e2e-windows-amd64.exe -minikube-start-args="--vm-driver=virtualbox --expected-default-driver=hyperv" -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=30m +out/e2e-windows-amd64.exe -minikube-start-args="--vm-driver=virtualbox" -expected-default-driver=hyperv -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"}