From f18e05a8d43a1e6b57e925bfd2a1cd73c6df71cc Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Tue, 4 Dec 2018 13:37:31 -0800 Subject: [PATCH] none cleanup: force kubeadm, clear /etc/kubernetes, and use sudo for kubectl kill --- hack/jenkins/common.sh | 2 +- hack/jenkins/linux_integration_tests_none.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index de6cf8a4a1..7d60ee8d0c 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -154,7 +154,7 @@ fi if pgrep kubectl; then echo "killing hung kubectl processes ..." ps -afe | grep kubectl | grep -v grep || true - pgrep kubectl | xargs kill || true + pgrep kubectl | ${SUDO_PREFIX} xargs kill || true fi mkdir -p "${TEST_HOME}" diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 6adef9e354..da2255058e 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -36,9 +36,11 @@ export KUBECONFIG="/root/.kube/config" # "none" driver specific cleanup from previous runs. # kubeadm -sudo kubeadm reset || true +sudo kubeadm reset -f || true # Cleanup data directory sudo rm -rf /data/* +# Cleanup old Kubernetes configs +sudo rm -rf /etc/kubernetes/* # Stop any leftover kubelets systemctl is-active --quiet kubelet \ && echo "stopping kubelet" \