Merge ~paelzer/ubuntu/+source/libvirt:merge-8.0-jammy into ubuntu/+source/libvirt:debian/sid

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4753/+packages

Regression tests are ongoing, but looking good enough by now to get the reviews started.

Tests identified https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1959054 which is ongoing (fixes/tests). Other than that regression tests already look mostly good (only some yet to debug network issue on x86 only).

Autopkg are good as well:
  libvirt @ amd64:
    27.01.22 14:40:50 Log 🗒️ ✅ Triggers: ['libvirt/8.0.0-1ubuntu1~jammyppa2']
      smoke PASS ✅
      smoke-lxc PASS ✅
      build-test PASS ✅
  libvirt @ arm64:
    27.01.22 14:54:42 Log 🗒️ ✅ Triggers: ['libvirt/8.0.0-1ubuntu1~jammyppa2']
      smoke PASS ✅
      smoke-lxc PASS ✅
      build-test PASS ✅
  libvirt @ armhf:
    27.01.22 14:42:55 Log 🗒️ ✅ Triggers: ['libvirt/8.0.0-1ubuntu1~jammyppa2']
      smoke PASS ✅
      build-test PASS ✅
  libvirt @ ppc64el:
    27.01.22 14:47:29 Log 🗒️ ✅ Triggers: ['libvirt/8.0.0-1ubuntu1~jammyppa2']
      smoke PASS ✅
      smoke-lxc PASS ✅
      build-test PASS ✅
  libvirt @ s390x:
    27.01.22 14:41:04 Log 🗒️ ✅ Triggers: ['libvirt/8.0.0-1ubuntu1~jammyppa2']
      smoke PASS ✅
      smoke-lxc PASS ✅
      build-test PASS ✅

FYI the strangest new Delta is about the service handling due to recent debhelper/systemd fun.
I submitted that to Debian to not be odd delta forever:
=> https://salsa.debian.org/libvirt-team/libvirt/-/merge_requests/132

Thanks for the MP, Christian.

As usual, a big diff to review! I could not find the regular merge tags (reconstruct, split and logical), so it's "a bit" more work to check that the delta is OK. Here's the command I've used (which is not perfect, so I needed to tweak things a bit):

diff -u <(git log pkg/import/7.0.0-1..pkg/import/7.6.0-0ubuntu3 --format=%s -- debian/ | grep -v '^changelog' | grep -v '^update-maintainer' | sort) <(git log pkg/import/8.0.0-1..merge-8.0-jammy --format=%s -- debian/ | grep -v '^changelog' | grep -v '^update-maintainer' | sort)

I'm also happy with the PPA build (I won't build the package locally; takes too long), and I'm happy with the autopkgtest that have been run on the infra (again, I won't run them locally, and TBH running directly on the infra is better anyway).

I double-checked all commits and made sure that they are being properly listed in the d/changelog entry. I'm leaving a few minor comments in the changelog; they're cosmetic, though.

As for the debhelper/systemd change, my only comment is that you're still using the option "--no-stop-on-upgrade" when invoking dh_installsystemd on d/rules. I think it is best to remove that option, because otherwise debhelper will generate the bogus snippet anyway and it may get executed on postinst/prerm. WDYT?

I'm overall satisfied with the MP. If you have the time and can wait, feel free to push the merge tags and I will take a closer look into the delta. Otherwise, I am OK if you'd like to proceed; there's nothing strange that caught my eyes.

Yeah sorry, co-developing so much on Salsa makes me forget to provide the usual set of tags. Also we went ahead of Debian multiple times but fetching commits from salsa in those, which makes our past look noisy.
Due to always maintaining with git-ubuntu the TL;DR is pkg/ubuntu/jammy-devel == deconstruct, so it isn't too hard despite looking ugly.
Here they are:
To ssh://git.launchpad.net/~paelzer/ubuntu/+source/libvirt
 * [new tag] merge-8.0-jammy-former-deconstruct -> merge-8.0-jammy-former-deconstruct
 * [new tag] merge-8.0-jammy-former-logical -> merge-8.0-jammy-former-logical
Next time just remind me instead of feeling the pain, I'll then do my duty to create and provide them right away.

The debhelper/systemd situation is still up for debate and discussion in the Debian PR and debian bug.
I'm gonna upload libvirt once we have settled there.
Your suggestion of dropping --no-stop-on-upgrade is interesting, I rechecked and dbus uses an even more confusing "--no-restart-after-upgrade --no-start". I'll have a look and also try only using "--no-start".
The currently proposed code does work through all tests that I found, which is why I'd like to keep it until I had time to find a better one :-)
If the Debian discussions take too long I might upload libvirt as proposed here "for now" and later once (as discussed in standup) we know how bug 1959054 resolves for Ubuntu rewrite it depending on that.
TL;DR - something working for now, resolve it before jammy-release

Thanks for the inline comments, I'll have a look at each of them ...

Changlog updates added - thanks

I've started a build with just "--no-start" to evaluate the effective generated maintainer script contents with that ...

FYI @Sergio:
Only using "--no-start" compared to what I proposed "--no-stop-on-upgrade --no-start" only drops a snippet in prerm that will stop the services on removal.
That isn't helping, if they were started it is indeed helpful to stop them before rmeoval.
For install/upgrade this snippet has no effect.
Therefore I'd - for now - leave it as "--no-stop-on-upgrade --no-start" which is the most explicit expression of "do not do anything please".

I'll rebuild with the former again ...

On Tuesday, February 01 2022, Christian Ehrhardt  wrote:

> FYI @Sergio:
> Only using "--no-start" compared to what I proposed "--no-stop-on-upgrade --no-start" only drops a snippet in prerm that will stop the services on removal.
> That isn't helping, if they were started it is indeed helpful to stop them before rmeoval.
> For install/upgrade this snippet has no effect.
> Therefore I'd - for now - leave it as "--no-stop-on-upgrade --no-start" which is the most explicit expression of "do not do anything please".
>
> I'll rebuild with the former again ...

Thanks for the follow up, Christian. BTW, not having the git-ubuntu
tags was no pain; I just had to improvise with git, but that's fine.

FWIW, thank you for double-checking what removing "--no-stop-on-upgrade"
causes. Based on your findings I agree that it's OK to leave the option
as is. I'm also hoping that this bug will be fixed before the release,
and that you will be able to drop this particular delta soon.

Anyway, with all of this out of the way, the MP now LGTM. +1.

Cheers,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

Uploading with the mitigation for the debhelper issue to unblock others.
But the plan is to drop this mitigation before jammy release once debhelper is fixed.

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libvirt_8.0.0-1ubuntu1.dsc: done.
  Uploading libvirt_8.0.0.orig.tar.xz: done.
  Uploading libvirt_8.0.0-1ubuntu1.debian.tar.xz: done.
  Uploading libvirt_8.0.0-1ubuntu1_source.buildinfo: done.
  Uploading libvirt_8.0.0-1ubuntu1_source.changes: done.
Successfully uploaded packages.

https://launchpad.net/ubuntu/+source/libvirt/8.0.0-1ubuntu1
=> Merged