kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add or-trues

pull/3418/head
Thomas Stromberg 2018-12-05 13:48:31 -08:00
parent 0a40801421
commit 1b155d9952
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/jenkins/common.sh
View File

@ -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