[Merge] ~jawn-smith/ubuntu-release-upgrader:lp1907713 into ubuntu-release-upgrader:ubuntu/master

[Brian Murray]

Review: Needs Information

I've just a few in-line comments regarding the words, otherwise the code looks good.

Diff comments:

> diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
> index f7f3fb1..00cb09b 100644
> --- a/DistUpgrade/DistUpgradeQuirks.py
> +++ b/DistUpgrade/DistUpgradeQuirks.py
> @@ -344,6 +345,27 @@ class DistUpgradeQuirks(object):
>                        "with this hardware."))
>                  self.controller.abort()
>  
> +    def _test_and_fail_on_aufs(self):
> +        """
> +        Test and fail if docker has aufs graphdriver available

Is graphdriver the right term? I've no idea.

> +        as it is deprecated after 20.04. Even if no containers are
> +        currently running aufs, the upgrade could break existing
> +        container images.
> +        """
> +        for aufs_dir in ("/var/snap/docker/common/var-lib-docker/aufs",
> +                         "/var/lib/docker/aufs"):
> +            if (os.path.exists(aufs_dir)):
> +                logging.error("Docker config uses aufs")
> +                summary = _("Sorry, this storage driver is not supported "
> +                            "in newer kernels")

Maybe "in kernels for newer releases" would be clearer? We don't want people to think if they keep running 20.04 LTS that they'll lose support for aufs.

> +                msg = _("There will not be any further Ubuntu releases "
> +                        "that support the aufs storage driver.\n\n"

Would "that provide kernel support for the" be more explicit and accurate?

> +                        "Please ensure that none of your containers are "
> +                        "using the aufs storage driver, remove the directory "
> +                        "%s and try again." % aufs_dir)
> +                self._view.error(summary, msg)
> +                self.controller.abort()
> +
>      def _test_and_warn_if_vserver(self):
>          """
>          upstart and vserver environments are not a good match, warn
> diff --git a/debian/changelog b/debian/changelog
> index faf7e01..10d3c6c 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,10 @@
> +ubuntu-release-upgrader (1:21.04.5) UNRELEASED; urgency=medium
> +
> +  * Add quirk to block upgrade if docker containers have support for

Is it "have support for" or "are using the"?

> +    aufs storage-driver (LP: #1907713)
> +
> + -- William 'jawn-smith' Wilson <william.wilson at canonical.com>  Mon, 22 Feb 2021 16:16:48 -0600
> +
>  ubuntu-release-upgrader (1:21.04.4) hirsute; urgency=medium
>  
>    * Run old tests on amd64 so ports that did not exist back then work


-- 
https://code.launchpad.net/~jawn-smith/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/398557
Your team Ubuntu Core Development Team is subscribed to branch ubuntu-release-upgrader:ubuntu/master.