diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 767e6867a0..3e78045e2e 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -37,9 +37,10 @@ SUDO_PREFIX="sudo -E " export KUBECONFIG="/root/.kube/config" # "none" driver specific cleanup from previous runs. +sudo kubeadm reset -f || true +# kubeadm reset may not stop pods immediately +docker rm -f $(docker ps -aq) >/dev/null 2>&1 || true -# Try without -f first, primarily because older kubeadm versions (v1.10) don't support it anyways. -sudo kubeadm reset || sudo kubeadm reset -f || true # Cleanup data directory sudo rm -rf /data/* # Cleanup old Kubernetes configs