kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adjust -expected-default-driver invocation

pull/5722/head
Thomas Stromberg 2019-10-23 22:06:48 -07:00
parent dcdac36e98
commit bdd937d360
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/jenkins/common.sh
View File

@ -256,12 +256,14 @@ fi
echo "" echo ""
echo ">> Starting ${E2E_BIN} at $(date)" echo ">> Starting ${E2E_BIN} at $(date)"
set -x
${SUDO_PREFIX}${E2E_BIN} \ ${SUDO_PREFIX}${E2E_BIN} \
-minikube-start-args="--vm-driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \ -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.timeout=60m \
-test.parallel=${PARALLEL_COUNT} \ -test.parallel=${PARALLEL_COUNT} \
-binary="${MINIKUBE_BIN}" && result=$? || result=$? -binary="${MINIKUBE_BIN}" && result=$? || result=$?
set +x
echo ">> ${E2E_BIN} exited with ${result} at $(date)" echo ">> ${E2E_BIN} exited with ${result} at $(date)"
echo "" echo ""

2
hack/jenkins/windows_integration_test_virtualbox.ps1
View File

@ -19,7 +19,7 @@ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata .
./out/minikube-windows-amd64.exe delete ./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 $env:result=$lastexitcode
# If the last exit code was 0->success, x>0->error # If the last exit code was 0->success, x>0->error
If($env:result -eq 0){$env:status="success"} If($env:result -eq 0){$env:status="success"}