particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/cases: properly kill journal for installers.sh

Browse source 
CI gets stuck if we don't kill the journal watcher on exit.
See bc1a7dc30c for more info.
This commit is contained in:
Jakub Rusz 2022-01-18 09:47:58 +01:00 • committed by Sanne Raymaekers
parent 35fd20c0de
commit 98f5623914
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/cases/installers.sh
View file

@ -166,6 +166,8 @@ build_image() {
WORKER_UNIT=$(sudo systemctl list-units | grep -o -E "osbuild.*worker.*\.service")
sudo journalctl -af -n 1 -u "${WORKER_UNIT}" &
WORKER_JOURNAL_PID=$!
# Stop watching the worker journal when exiting.
trap 'sudo pkill -P ${WORKER_JOURNAL_PID}' EXIT
# Start the compose.
greenprint "🚀 Starting compose"
@ -206,8 +208,9 @@ build_image() {
exit 1
fi
# Stop watching the worker journal.
# Kill the journal monitor immediately and remove the trap
sudo pkill -P ${WORKER_JOURNAL_PID}
trap - EXIT
}
# Wait for the ssh server up to be.