From 1b155d9952c16310a00ade613d6cf7272bd16ddd Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Wed, 5 Dec 2018 13:48:31 -0800 Subject: [PATCH] add or-trues --- hack/jenkins/common.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index a54a5f334d..c277b3bb25 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -80,8 +80,7 @@ export MINIKUBE_BIN="out/minikube-${OS_ARCH}" export E2E_BIN="out/e2e-${OS_ARCH}" chmod +x "${MINIKUBE_BIN}" "${E2E_BIN}" out/docker-machine-driver-* - -procs=$(pgrep "minikube-${OS_ARCH}|e2e-${OS_ARCH}") +procs=$(pgrep "minikube-${OS_ARCH}|e2e-${OS_ARCH}" || true) if [[ "${procs}" != "" ]]; then echo "ERROR: found stale test processes to kill:" ps -f -p ${procs} || true @@ -154,10 +153,10 @@ if [[ "${VM_DRIVER}" == "hyperkit" ]]; then fi fi -kprocs=$(pgrep kubectl) +kprocs=$(pgrep kubectl || true) if [[ "${kprocs}" != "" ]]; then echo "error: killing hung kubectl processes ..." - ps -f -p ${kprocs} true + ps -f -p ${kprocs} || true kill ${kprocs} || true fi