Skip to content

Commit 5331cbe

Browse files
authored
Merge pull request #11616 from spowelljr/improveWindowsSetup
Delete `minikube-integration` folder in case last test failed to delete it
2 parents a2db6a9 + cc89907 commit 5331cbe

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

hack/jenkins/windows_integration_setup.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
$test_root="$env:HOMEDRIVE$env:HOMEPATH\minikube-integration"
16-
$test_home="$test_root\$env:COMMIT"
15+
$test_home="$env:HOMEDRIVE$env:HOMEPATH\minikube-integration"
1716
$env:KUBECONFIG="$test_home\kubeconfig"
1817
$env:MINIKUBE_HOME="$test_home\.minikube"
1918

19+
# delete in case previous test was unexpectedly ended and teardown wasn't run
20+
rm -r -Force $test_home
2021
mkdir -p $test_home

hack/jenkins/windows_integration_teardown.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
$test_root="$env:HOMEDRIVE$env:HOMEPATH\minikube-integration"
16-
$test_home="$test_root\$env:COMMIT"
15+
$test_home="$env:HOMEDRIVE$env:HOMEPATH\minikube-integration"
1716

18-
rm -r $test_home
17+
rm -r -Force $test_home

0 commit comments

Comments
 (0)