On Sat, 6 Dec 2025, Marek Marczykowski-Górecki wrote: > The recent failure affected only glibc-based systems, so do the test on > Debian too. > > Signed-off-by: Marek Marczykowski-Górecki <[email protected]>
Acked-by: Stefano Stabellini <[email protected]> > --- > Changes in v3: > - update to trixie > Changes in v2: > - use systemd in Debian > --- > automation/build/debian/13-x86_64.dockerfile | 1 +- > automation/gitlab-ci/test.yaml | 19 ++++++++++++++++++- > automation/scripts/qemu-driverdomains-x86_64.sh | 18 +++++++++++++++-- > 3 files changed, 36 insertions(+), 2 deletions(-) > > diff --git a/automation/build/debian/13-x86_64.dockerfile > b/automation/build/debian/13-x86_64.dockerfile > index 6382bafbd5bd..3f84ba4a8823 100644 > --- a/automation/build/debian/13-x86_64.dockerfile > +++ b/automation/build/debian/13-x86_64.dockerfile > @@ -60,6 +60,7 @@ RUN <<EOF > fakeroot > ovmf > qemu-system-x86 > + systemctl > > # for build-each-commit-gcc > ccache > diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml > index abc5339a74ab..ffb2880f5af3 100644 > --- a/automation/gitlab-ci/test.yaml > +++ b/automation/gitlab-ci/test.yaml > @@ -30,6 +30,17 @@ > job: microcode-x86 > ref: master > > +.debian-x86-64-test-needs: &debian-x86-64-test-needs > + - project: xen-project/hardware/test-artifacts > + job: linux-6.6.56-x86_64 > + ref: master > + - project: xen-project/hardware/test-artifacts > + job: debian-13-x86_64-rootfs > + ref: master > + - project: xen-project/hardware/test-artifacts > + job: microcode-x86 > + ref: master > + > .qemu-arm64: > extends: .test-jobs-common > variables: > @@ -664,6 +675,14 @@ qemu-alpine-driverdomains-x86_64-gcc: > - *x86-64-test-needs > - alpine-3.22-gcc > > +qemu-debian-13-driverdomains-x86_64-gcc: > + extends: .qemu-x86-64 > + script: > + - ./automation/scripts/qemu-driverdomains-x86_64.sh 2>&1 | tee ${LOGFILE} > + needs: > + - *debian-x86-64-test-needs > + - debian-13-x86_64-gcc-debug > + > qemu-smoke-x86-64-gcc: > extends: .qemu-smoke-x86-64 > script: > diff --git a/automation/scripts/qemu-driverdomains-x86_64.sh > b/automation/scripts/qemu-driverdomains-x86_64.sh > index c0241da54168..6a69282470ca 100755 > --- a/automation/scripts/qemu-driverdomains-x86_64.sh > +++ b/automation/scripts/qemu-driverdomains-x86_64.sh > @@ -23,7 +23,11 @@ if grep -q test=backend /proc/cmdline; then > brctl addbr xenbr0 > ip link set xenbr0 up > ip addr add 192.168.0.1/24 dev xenbr0 > - bash /etc/init.d/xendriverdomain start > + if [ -d /run/systemd ]; then > + systemctl start xendriverdomain > + else > + bash /etc/init.d/xendriverdomain start > + fi > # log backend-related logs to the console > tail -F /var/log/xen/xldevd.log /var/log/xen/xen-hotplug.log > >>/dev/console 2>/dev/null & > else > @@ -85,7 +89,11 @@ cat > etc/local.d/xen.start << EOF > > set -x > > -bash /etc/init.d/xencommons start > +if [ -d /run/systemd ]; then > + systemctl start xen-init-dom0.service > +else > + bash /etc/init.d/xencommons start > +fi > > xl list > > @@ -102,6 +110,12 @@ cp ../bzImage ./root/ > mkdir -p etc/default > echo 'XENCONSOLED_TRACE=all' >> etc/default/xencommons > mkdir -p var/log/xen/console > +if [ -e etc/systemd/system.conf ]; then > + systemctl --root=. enable \ > + xenstored.service \ > + xenconsoled.service \ > + xen-init-dom0.service > +fi > fakeroot -i ../fakeroot-save mkfs.ext4 -d . ../dom0-rootfs.img 2048M > cd .. > rm -rf rootfs > -- > git-series 0.9.1 >
