From a8bae1311ec7dca0be2897f11148fcf490af6273 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 28 Jan 2021 09:46:47 -0800 Subject: [PATCH] fail docker tests immediately of docker doesn't start up --- hack/jenkins/setup_docker_desktop_windows.ps1 | 1 + hack/jenkins/windows_integration_test_docker.ps1 | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/hack/jenkins/setup_docker_desktop_windows.ps1 b/hack/jenkins/setup_docker_desktop_windows.ps1 index 14aba3d940..f1e82689ec 100644 --- a/hack/jenkins/setup_docker_desktop_windows.ps1 +++ b/hack/jenkins/setup_docker_desktop_windows.ps1 @@ -31,3 +31,4 @@ while($attempt -ne 0) { Get-Process "*Docker Desktop*" | Stop-Process $attempt -= 1 } +exit 1 diff --git a/hack/jenkins/windows_integration_test_docker.ps1 b/hack/jenkins/windows_integration_test_docker.ps1 index 8791fbee9e..2265c1d0b9 100644 --- a/hack/jenkins/windows_integration_test_docker.ps1 +++ b/hack/jenkins/windows_integration_test_docker.ps1 @@ -19,6 +19,11 @@ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata . gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/setup_docker_desktop_windows.ps1 out/ ./out/setup_docker_desktop_windows.ps1 +If ($lastexitcode -gt 0) { + echo "Docker failed to start, exiting." + Exit $lastexitcode +} + ./out/minikube-windows-amd64.exe delete --all