[Merge] ~nicolasbock/netplan:tristate-jammy into ~ubuntu-core-dev/netplan/+git/ubuntu:ubuntu/jammy

[Lukas Märdian]

Review: Needs Fixing

Thank you very much Nicolas for preparing a debdiff/merge-proposal on top of the currently pending netplan Jammy SRU changeset!

The suggested patch is looking good so far, but I left a few inline comments (see below). Furthermore, there might be some misunderstanding of how to apply distro patches. We do not want to modify any files of the "upstream source" in this repository (e.g. src/ doc/ netplan/ ...), but ONLY files in the debian/ packaging subdirectory. Please revert those changes to the upstream source, the new "distro-patch" (quilt) you added in debian/patches/0003-Add-tristate-type-for-offload-options-LP-1956264-270.patch will apply those changes for us during the package build.

Another thing: You missed to add the "ethtool" test-dependency to the "ethernets" test in debian/tests/control, this needs to be added in order to make the new offloading autopkgtests PASS (as has been done here: http://launchpadlibrarian.net/601540356/netplan.io_0.104-0ubuntu2_0.104-0ubuntu3.diff.gz).

Some of my suggested changes/fixes:
https://paste.ubuntu.com/p/vKJR7yMN92/

Last but not least, please adopt the bug report in LP: #1956264 according to the SRU template in https://wiki.ubuntu.com/StableReleaseUpdates#SRU_Bug_Template, describing a proper test case/reporducer and impact analysis, to make it fit for SRU.

Keep up the good work!

Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index 0a35b63..3548933 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,9 +1,14 @@
> -netplan.io (0.104-0ubuntu2.1) UNRELEASED; urgency=medium
> +netplan.io (0.104-0ubuntu2.2) UNRELEASED; urgency=medium

The SRU version can stay at 0.104-0ubuntu2.1, as the pending/staged changes are still in UNRELEASED state.

>  
> +  [ Lukas Märdian ]
>    * Cherry-pick fix for rendering WPA3 password (8934a1b), LP: #1975576
>      + d/p/0010-nm-fix-rendering-of-password-for-unknown-passthrough.patch
>  
> - -- Lukas Märdian <slyon at ubuntu.com>  Tue, 24 May 2022 11:15:29 +0200
> +  [ Nicolas Bock ]
> +  * Backport offloading tristate patches (dc3b335), LP: #1956264
> +    + d/p/0003-Add-tristate-type-for-offload-options-LP-1956264-270.patch
> +
> + -- Nicolas Bock <nicolas.bock at canonical.com>  Mon, 06 Jun 2022 16:20:44 -0600
>  
>  netplan.io (0.104-0ubuntu2) jammy; urgency=medium
>  
> diff --git a/debian/patches/series b/debian/patches/series
> index 27d8728..77cbaaa 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -1,3 +1,4 @@
> +0003-Add-tristate-type-for-offload-options-LP-1956264-270.patch

Maybe we could move this distro patch directly after 0002-cli-apply-fix-potential-race-with-rename-creation-of.patch to keep ordering more in line with the ubuntu/devel branch.

>  autopkgtest-fixes.patch
>  0002-cli-apply-fix-potential-race-with-rename-creation-of.patch
>  0010-nm-fix-rendering-of-password-for-unknown-passthrough.patch


-- 
https://code.launchpad.net/~nicolasbock/netplan/+git/netplan/+merge/424017
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/netplan/+git/ubuntu:ubuntu/jammy.