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

tests: kill journalctl even if compose fails

Browse source 
This prevents Gitlab CI from getting stuck if something
goes wrong with the compose.
This commit is contained in:
Jakub Rusz 2021-06-03 13:52:13 +02:00 • committed by Alexander Todorov
parent 8c1afdd727
commit 3a8c6c8ab8
6 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/cases/azure.sh
View file

@ -150,6 +150,8 @@ sudo composer-cli blueprints depsolve bash
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 and upload to Azure.
greenprint "🚀 Starting compose"
@ -182,9 +184,6 @@ if [[ $COMPOSE_STATUS != FINISHED ]]; then
exit 1
fi
# Stop watching the worker journal.
sudo pkill -P ${WORKER_JOURNAL_PID}
# Set up necessary variables for terraform
export TF_VAR_RESOURCE_GROUP="$AZURE_RESOURCE_GROUP"
export TF_VAR_STORAGE_ACCOUNT="$AZURE_STORAGE_ACCOUNT"