process cleanup attempt
Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
parent
08f2113882
commit
a43eafe1b0
|
|
@ -23,4 +23,4 @@ if [[ "x${CSI_MODE}" != "x" ]];then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# > "${LOG_PATH}" 2>&1
|
# > "${LOG_PATH}" 2>&1
|
||||||
./bin/democratic-csi --log-level debug --driver-config-file "${CONFIG_FILE}" --csi-version "${CSI_VERSION}" --csi-name "driver-test" --server-socket "${CSI_ENDPOINT}" ${EXTRA_ARGS}
|
exec ./bin/democratic-csi --log-level debug --driver-config-file "${CONFIG_FILE}" --csi-version "${CSI_VERSION}" --csi-name "driver-test" --server-socket "${CSI_ENDPOINT}" ${EXTRA_ARGS}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,13 @@
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
trap 'kill -- -$(ps -o pgid= $PID | grep -o '[0-9]*')' EXIT
|
_term() {
|
||||||
|
[[ -n "${SUDO_PID}" ]] && kill -- "${SUDO_PID}"
|
||||||
|
}
|
||||||
|
|
||||||
|
trap _term EXIT
|
||||||
|
|
||||||
|
#trap 'kill -- -$(ps -o pgid= $PID | grep -o '[0-9]*')' EXIT
|
||||||
#trap 'kill -- -$PGID' EXIT
|
#trap 'kill -- -$PGID' EXIT
|
||||||
#trap 'sudo kill -- -$PGID' EXIT
|
#trap 'sudo kill -- -$PGID' EXIT
|
||||||
#trap 'sudo kill $(jobs -p)' EXIT
|
#trap 'sudo kill $(jobs -p)' EXIT
|
||||||
|
|
@ -18,6 +24,7 @@ export CI_BUILD_KEY=$(uuidgen | cut -d "-" -f 1)
|
||||||
|
|
||||||
# launch the server
|
# launch the server
|
||||||
sudo -E ci/bin/launch-server.sh &
|
sudo -E ci/bin/launch-server.sh &
|
||||||
|
SUDO_PID=$!
|
||||||
|
|
||||||
# wait for server to launch
|
# wait for server to launch
|
||||||
sleep 10
|
sleep 10
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue