|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] automation: skip building domU if there is no test defined for it
commit ae521cd96f98adc99df0d897aedd384535b7f21d
Author: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
AuthorDate: Wed Feb 19 03:56:51 2025 +0100
Commit: Stefano Stabellini <stefano.stabellini@xxxxxxx>
CommitDate: Mon Mar 3 16:15:37 2025 -0800
automation: skip building domU if there is no test defined for it
This will be useful for later tests not using generic domU (unit tests,
xtf etc).
Signed-off-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Stefano Stabellini <stefano.stabellini@xxxxxxx>
---
automation/scripts/qubes-x86-64.sh | 50 +++++++++++++++++++++++---------------
1 file changed, 31 insertions(+), 19 deletions(-)
diff --git a/automation/scripts/qubes-x86-64.sh
b/automation/scripts/qubes-x86-64.sh
index 8a0b7bfbc0..7eb3ce1bf7 100755
--- a/automation/scripts/qubes-x86-64.sh
+++ b/automation/scripts/qubes-x86-64.sh
@@ -144,26 +144,28 @@ disk = [ ]
${domU_extra_config}
"
-# DomU
-mkdir -p rootfs
-cd rootfs
-# fakeroot is needed to preserve device nodes in rootless podman container
-fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz
-mkdir proc
-mkdir run
-mkdir srv
-mkdir sys
-rm var/run
-echo "#!/bin/sh
+if [ -n "$domU_check" ]; then
+ # DomU
+ mkdir -p rootfs
+ cd rootfs
+ # fakeroot is needed to preserve device nodes in rootless podman container
+ fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz
+ mkdir proc
+ mkdir run
+ mkdir srv
+ mkdir sys
+ rm var/run
+ echo "#!/bin/sh
${domU_check}
" > 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
+ 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
+fi
# DOM0 rootfs
mkdir -p rootfs
@@ -188,11 +190,19 @@ ifconfig eth0 up
ifconfig xenbr0 up
ifconfig xenbr0 192.168.0.1
+" > etc/local.d/xen.start
+
+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
${dom0_check}
-" > etc/local.d/xen.start
+" >> etc/local.d/xen.start
+else
+ echo "${dom0_check}" >> etc/local.d/xen.start
+fi
+
chmod +x etc/local.d/xen.start
echo "$domU_config" > etc/xen/domU.cfg
@@ -201,7 +211,9 @@ echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons
echo "QEMU_XEN=/bin/false" >> etc/default/xencommons
mkdir -p var/log/xen/console
cp ../binaries/bzImage boot/vmlinuz
-cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU
+if [ -n "$domU_check" ]; then
+ cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU
+fi
find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip >
../binaries/dom0-rootfs.cpio.gz
cd ..
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |