| Message ID | 12d51df19d6111c2f61910e9851595aecceb752b.1743678257.git-series.marmarek@invisiblethingslab.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Several CI cleanups and improvements, plus yet another new runner | expand |
On Thu, 3 Apr 2025, Marek Marczykowski-Górecki wrote: > And start collecting qemu log earlier, so it isn't lost in case of a > timeout during domain startup. > > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> As we are doing this across the board please also do the same for xilinx-smoke-dom0-x86_64.sh > --- > automation/scripts/qemu-alpine-x86_64.sh | 2 +- > automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- > automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- > automation/scripts/qubes-x86-64.sh | 4 ++-- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh > index 1ff689b577e3..17e2141d625e 100755 > --- a/automation/scripts/qemu-alpine-x86_64.sh > +++ b/automation/scripts/qemu-alpine-x86_64.sh > @@ -56,7 +56,7 @@ bash /etc/init.d/xencommons start > > xl list > > -xl create -c /root/test.cfg > +xl -vvv create -c /root/test.cfg > > " > etc/local.d/xen.start > chmod +x etc/local.d/xen.start > diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh > index e1cd83880928..0c60a66e25e3 100755 > --- a/automation/scripts/qemu-smoke-dom0-arm32.sh > +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh > @@ -21,7 +21,7 @@ echo "#!/bin/bash > > xl list > > -xl create -c /root/test.cfg > +xl -vvv create -c /root/test.cfg > > " > ./root/xen.start > echo "bash /root/xen.start" >> ./etc/init.d/xen-watchdog > diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh > index 4d22a124df11..8774a8701232 100755 > --- a/automation/scripts/qemu-smoke-dom0-arm64.sh > +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh > @@ -52,7 +52,7 @@ bash /etc/init.d/xencommons start > > xl list > > -xl create -c /root/test.cfg > +xl -vvv create -c /root/test.cfg > > " > etc/local.d/xen.start > chmod +x etc/local.d/xen.start > diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh > index d316c17e0c9f..822b81d186a7 100755 > --- a/automation/scripts/qubes-x86-64.sh > +++ b/automation/scripts/qubes-x86-64.sh > @@ -122,7 +122,6 @@ echo \"${passed}\" > " > > dom0_check=" > -tail -F /var/log/xen/qemu-dm-domU.log & > until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU.log; do > sleep 1 > done > @@ -222,7 +221,8 @@ if [ -n "$domU_check" ]; then > echo " > # get domU console content into test log > tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & > -xl create /etc/xen/domU.cfg > +tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & > +xl -vvv create /etc/xen/domU.cfg > ${dom0_check} > " >> etc/local.d/xen.start > else > -- > git-series 0.9.1 >
diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 1ff689b577e3..17e2141d625e 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -56,7 +56,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index e1cd83880928..0c60a66e25e3 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -21,7 +21,7 @@ echo "#!/bin/bash xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > ./root/xen.start echo "bash /root/xen.start" >> ./etc/init.d/xen-watchdog diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 4d22a124df11..8774a8701232 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -52,7 +52,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index d316c17e0c9f..822b81d186a7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -122,7 +122,6 @@ echo \"${passed}\" " dom0_check=" -tail -F /var/log/xen/qemu-dm-domU.log & until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU.log; do sleep 1 done @@ -222,7 +221,8 @@ if [ -n "$domU_check" ]; then echo " # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & +xl -vvv create /etc/xen/domU.cfg ${dom0_check} " >> etc/local.d/xen.start else
And start collecting qemu log earlier, so it isn't lost in case of a timeout during domain startup. Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> --- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)