diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1 index 9fede4e11f..4df7a9b298 100644 --- a/hack/jenkins/common.ps1 +++ b/hack/jenkins/common.ps1 @@ -41,17 +41,26 @@ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/windows_cleanup_ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/windows_cleanup_cron.ps1 out/ ./out/windows_cleanup_cron.ps1 -# Make sure Docker is up and running -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." +# check for Docker CLI +docker --help +if ($lastexitcode -gt 0) { + echo "Docker CLI not found, exiting." + $json = "{`"state`": `"failure`", `"description`": `"Jenkins: Docker CLI not found`", `"target_url`": `"https://storage.googleapis.com/$gcs_bucket/$env:JOB_NAME.txt`", `"context`": `"$env:JOB_NAME`"}" + Write-GithubStatus -JsonBody $json + Exit $lastexitcode +} - $json = "{`"state`": `"failure`", `"description`": `"Jenkins: docker failed to start`", `"target_url`": `"https://storage.googleapis.com/$gcs_bucket/Hyper-V_Windows.txt`", `"context`": `"$env:JOB_NAME`"}" - - Write-GithubStatus -JsonBody $json +if ($driver -eq "docker") { + # Make sure Docker is up and running + 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." + $json = "{`"state`": `"failure`", `"description`": `"Jenkins: docker failed to start`", `"target_url`": `"https://storage.googleapis.com/$gcs_bucket/$env:JOB_NAME.txt`", `"context`": `"$env:JOB_NAME`"}" + Write-GithubStatus -JsonBody $json + Exit $lastexitcode + } docker system prune -a --volumes -f - Exit $lastexitcode } # Download Go