[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/sid] 2 commits: Don't restart libvirt-guests on upgrade

[Guido Günther]

Guido Günther pushed to branch debian/sid at Libvirt Packaging Team / libvirt


Commits:
421e8656 by Guido Günther at 2020-03-30T11:37:02+02:00
Don't restart libvirt-guests on upgrade

Closes: #955216

- - - - -
5f720355 by Laurent Bigonville at 2020-03-30T11:38:00+02:00
Only run qemu test on amd64

Closes: #955278

- - - - -


3 changed files:

- debian/rules
- debian/tests/control
- debian/tests/smoke-qemu-session


Changes:

=====================================
debian/rules
=====================================
@@ -138,7 +138,6 @@ LIBVIRT_SYSTEM_SERVICES = \
 	libvirtd.socket \
 	libvirtd-ro.socket \
 	libvirtd-admin.socket \
-	libvirt-guests.service \
 	virtlogd.socket \
 	virtlogd-admin.socket \
 	virtlogd.service \
@@ -243,6 +242,7 @@ override_dh_installinit:
 override_dh_installsystemd:
 	dh_installsystemd -p libvirt-daemon-system --restart-after-upgrade libvirtd.service
 	dh_installsystemd -p libvirt-daemon-system --no-stop-on-upgrade $(LIBVIRT_SYSTEM_SERVICES)
+	dh_installsystemd -p libvirt-daemon-system --no-start libvirt-guests.service
 
 override_dh_installdocs:
 	dh_installdocs -plibvirt-doc --doc-main-package libvirt-doc


=====================================
debian/tests/control
=====================================
@@ -4,7 +4,7 @@ Restrictions: allow-stderr
 
 Tests: smoke-qemu-session
 Depends: libvirt-daemon, libvirt-clients, libxml2-utils, qemu-system, qemu-kvm
-Restrictions: allow-stderr, isolation-container
+Restrictions: allow-stderr, isolation-container, skippable, skip-not-installable
 
 Tests: smoke-lxc
 Depends: libvirt-daemon-system, libvirt-daemon-driver-lxc, libvirt-clients, libxml2-utils


=====================================
debian/tests/smoke-qemu-session
=====================================
@@ -19,12 +19,12 @@ trap cleanup EXIT
 
 if [ ! -f /vmlinuz ] || [ ! -f /initrd.img ]; then
    echo "Kernel or initrd not found...skipping".
-   exit 0
+   exit 77
 fi
 
 if [ $(uname -m) != "x86_64" ]; then
    echo "Not on x86_64...skipping"
-   exit 0
+   exit 77
 fi
 
 echo echo "Running as $USER"



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/793d3598a3c4332ab5cf3e554de2e01ebf318430...5f720355347119f6f13bc29e26247bbd59dc5935

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/793d3598a3c4332ab5cf3e554de2e01ebf318430...5f720355347119f6f13bc29e26247bbd59dc5935
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20200330/20130602/attachment-0001.html>