From 25e625ec0a48bd87428bf4e4986a2f15f019352b Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Sat, 11 Dec 2021 17:02:07 -0700 Subject: [PATCH] process cleanup attempt Signed-off-by: Travis Glenn Hansen --- ci/bin/run.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/ci/bin/run.sh b/ci/bin/run.sh index 40b9115..26ad7fb 100755 --- a/ci/bin/run.sh +++ b/ci/bin/run.sh @@ -4,17 +4,12 @@ set -e set -x _term() { - [[ -n "${SUDO_PID}" ]] && sudo kill -- "${SUDO_PID}" + #[[ -n "${SUDO_PID}" ]] && sudo kill -15 "${SUDO_PID}" + [[ -n "${SUDO_PID}" ]] && kill -15 "${SUDO_PID}" } trap _term EXIT -#trap 'kill -- -$(ps -o pgid= $PID | grep -o '[0-9]*')' EXIT -#trap 'kill -- -$PGID' EXIT -#trap 'sudo kill -- -$PGID' EXIT -#trap 'sudo kill $(jobs -p)' EXIT -#trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT - export PATH="/usr/local/lib/nodejs/bin:${PATH}" # install deps npm i @@ -31,6 +26,3 @@ sleep 10 # launch csi-sanity #sudo -E ci/bin/launch-csi-sanity.sh - -# kill all processes of the session -#sudo kill $(ps -s $$ -o pid=) || true