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

test/regression: fix journalctl for workers

Browse source 
Our workers are not named osbuild-worker but usually something like
osbuild-worker@1. Let's steal the code that determines the unit name
from other tests.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-12-08 13:12:55 +01:00 • committed by Achilleas Koutsou
parent 1ac1409753
commit df5074f509
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/cases/regression-composer-works-behind-satellite.sh
View file

@ -328,7 +328,8 @@ function try_image_build {
if ! sudo composer-cli --json compose start ${BLUEPRINT_NAME} qcow2 | tee "${COMPOSE_START}";
then
sudo journalctl -xe --unit osbuild-composer
sudo journalctl -xe --unit osbuild-worker
WORKER_UNIT=$(sudo systemctl list-units | grep -o -E "osbuild.*worker.*\.service")
sudo journalctl -xe --unit "${WORKER_UNIT}"
exit 1
fi
COMPOSE_ID=$(get_build_info ".build_id" "$COMPOSE_START")
@ -352,7 +353,8 @@ function try_image_build {
sudo composer-cli compose delete "${COMPOSE_ID}" >/dev/null
sudo journalctl -xe --unit osbuild-composer
sudo journalctl -xe --unit osbuild-worker
WORKER_UNIT=$(sudo systemctl list-units | grep -o -E "osbuild.*worker.*\.service")
sudo journalctl -xe --unit "${WORKER_UNIT}"
# Did the compose finish with success?
if [[ $COMPOSE_STATUS != FINISHED ]]; then