From 937e73feca9abaea06ec496cd93f8da8bd3b70bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 26 Apr 2023 02:16:14 +0200 Subject: [PATCH] automation: wait for the login prompt as test end marker MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The login prompt is printed after all the startup (test) scripts, wait for that instead of "passed" marker. And only then check if test passed. Before this patch there was a race: "passed" marker could be already printed, but the final check would fail because login prompt wasn't there yet. Also, modify etc/issue in domU rootfs to avoid confusing the one from domU with the dom0's one. Use the dom0 one as test end marker. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 916dbaae59..6c03097046 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -66,6 +66,7 @@ ${domU_check} /bin/sh" > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf +sed -i -e 's/^Welcome/domU \0/' etc/issue find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs @@ -159,7 +160,7 @@ if [ -n "$wait_and_wakeup" ]; then ssh $CONTROLLER wake fi -until grep "$passed" smoke.serial || [ $timeout -le 0 ]; do +until grep "^Welcome to Alpine Linux" smoke.serial || [ $timeout -le 0 ]; do sleep 1; : $((--timeout)) done -- 2.39.5