From 13993d565df174fa7385ca93b96b79c43cb51cdd Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 9 Nov 2021 07:54:09 -0500 Subject: [PATCH] fix running `minikube delete` before `MINIKUBE_HOME` set --- hack/jenkins/common.ps1 | 3 --- hack/jenkins/windows_integration_setup.ps1 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1 index ae376f3030..cdb06a80e4 100644 --- a/hack/jenkins/common.ps1 +++ b/hack/jenkins/common.ps1 @@ -63,9 +63,6 @@ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata . gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/windows_integration_setup.ps1 out/ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/windows_integration_teardown.ps1 out/ -# Make sure an old minikube instance isn't running -./out/minikube-windows-amd64.exe delete --all - ./out/windows_integration_setup.ps1 $started=Get-Date -UFormat %s diff --git a/hack/jenkins/windows_integration_setup.ps1 b/hack/jenkins/windows_integration_setup.ps1 index e1e2912de4..d585723f2f 100644 --- a/hack/jenkins/windows_integration_setup.ps1 +++ b/hack/jenkins/windows_integration_setup.ps1 @@ -16,6 +16,9 @@ $test_home="$env:HOMEDRIVE$env:HOMEPATH\minikube-integration" $env:KUBECONFIG="$test_home\kubeconfig" $env:MINIKUBE_HOME="$test_home\.minikube" +# Make sure an old minikube instance isn't running +./out/minikube-windows-amd64.exe delete --all --purge + if ($driver -eq "docker") { # Remove unused images and containers docker system prune --all --force --volumes