diff --git a/test/cases/aws.sh b/test/cases/aws.sh index d4ca5d6ca..8d3eccd80 100755 --- a/test/cases/aws.sh +++ b/test/cases/aws.sh @@ -159,6 +159,10 @@ greenprint "💬 Getting compose log and metadata" get_compose_log "$COMPOSE_ID" get_compose_metadata "$COMPOSE_ID" +# Kill the journal monitor immediately and remove the trap +sudo pkill -P ${WORKER_JOURNAL_PID} +trap - EXIT + # Did the compose finish with success? if [[ $COMPOSE_STATUS != FINISHED ]]; then echo "Something went wrong with the compose. 😢" diff --git a/test/cases/azure.sh b/test/cases/azure.sh index b6ea55c81..97388a901 100755 --- a/test/cases/azure.sh +++ b/test/cases/azure.sh @@ -178,6 +178,10 @@ greenprint "💬 Getting compose log and metadata" get_compose_log "$COMPOSE_ID" get_compose_metadata "$COMPOSE_ID" +# Kill the journal monitor immediately and remove the trap +sudo pkill -P ${WORKER_JOURNAL_PID} +trap - EXIT + # Did the compose finish with success? if [[ $COMPOSE_STATUS != FINISHED ]]; then echo "Something went wrong with the compose. 😢" diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh index f3b720ef6..87eb66cd1 100755 --- a/test/cases/ostree-ng.sh +++ b/test/cases/ostree-ng.sh @@ -152,6 +152,10 @@ build_image() { get_compose_log "$COMPOSE_ID" get_compose_metadata "$COMPOSE_ID" + # Kill the journal monitor immediately and remove the trap + sudo pkill -P ${WORKER_JOURNAL_PID} + trap - EXIT + # Did the compose finish with success? if [[ $COMPOSE_STATUS != FINISHED ]]; then echo "Something went wrong with the compose. 😢" diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh index 6c6a81e05..9dff22e0f 100755 --- a/test/cases/ostree.sh +++ b/test/cases/ostree.sh @@ -184,6 +184,10 @@ build_image() { get_compose_log "$COMPOSE_ID" get_compose_metadata "$COMPOSE_ID" + # Kill the journal monitor immediately and remove the trap + sudo pkill -P ${WORKER_JOURNAL_PID} + trap - EXIT + # Did the compose finish with success? if [[ $COMPOSE_STATUS != FINISHED ]]; then echo "Something went wrong with the compose. 😢" diff --git a/test/cases/vmware.sh b/test/cases/vmware.sh index b7ad46457..94d6e4bee 100755 --- a/test/cases/vmware.sh +++ b/test/cases/vmware.sh @@ -160,6 +160,10 @@ greenprint "💬 Getting compose log and metadata" get_compose_log "$COMPOSE_ID" get_compose_metadata "$COMPOSE_ID" +# Kill the journal monitor immediately and remove the trap +sudo pkill -P ${WORKER_JOURNAL_PID} +trap - EXIT + # Did the compose finish with success? if [[ $COMPOSE_STATUS != FINISHED ]]; then echo "Something went wrong with the compose. 😢" diff --git a/tools/libvirt_test.sh b/tools/libvirt_test.sh index a20826c5f..bfe9166c7 100755 --- a/tools/libvirt_test.sh +++ b/tools/libvirt_test.sh @@ -166,6 +166,10 @@ greenprint "💬 Getting compose log and metadata" get_compose_log "$COMPOSE_ID" get_compose_metadata "$COMPOSE_ID" +# Kill the journal monitor immediately and remove the trap +sudo pkill -P ${WORKER_JOURNAL_PID} +trap - EXIT + # Did the compose finish with success? if [[ $COMPOSE_STATUS != FINISHED ]]; then echo "Something went wrong with the compose. 😢"