Merge ~lamoura/ubuntu/+source/ubuntu-advantage-tools:upload-27.2.2-impish into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Lucas Albuquerque Medeiros de Moura]

This release will fix postinst problems where users have cloud-init in the system but cloud-id fails to run. We will no longer fail postinst in those situations

[Athos Ribeiro (athos-ribeiro)]

LGTM. While there are additional changes other than the regression fix itself, they are limited to changes to the test suite.

Will approve once Robie's comment on the changelog is addressed.

[Athos Ribeiro (athos-ribeiro)]

Note that, as Robie pointed out, we still need a not-SRU-reviewer core dev to do the actual review

review: Approve

[Bryce Harrington (bryce)]

On Tue, Jul 27, 2021 at 02:15:43PM -0000, Lucas Albuquerque Medeiros de Moura wrote:
>
>
> Diff comments:
>
> > diff --git a/debian/changelog b/debian/changelog
> > index 2441322..2a3b8b3 100644
> > --- a/debian/changelog
> > +++ b/debian/changelog
> > @@ -1,3 +1,10 @@
> > +ubuntu-advantage-tools (27.2.2~21.10) impish; urgency=medium
> > +
> > + * d/tools.postinst:
> > + - Do not fail in postinst if cloud-init did not run. (LP: #1936833)
>
> Fair enough Robie, but what should I reflect on the changelog entry to make users aware of that ?
> Would addding something like "Fix regression on release 27.2.1" enough ?
> Sorry, this is the first time I am working a regression fix :(

I like to think from the context of someone that might think they are
experiencing this regression, and describe it in a way that would match
how the behavior would look from their point of view. The goal there
being to help them identify whether upgrading would be worthwhile.

> > + -- Lucas Moura <email address hidden> Tue, 27 Jul 2021 10:09:18 -0300
> > +
> > ubuntu-advantage-tools (27.2.1~21.10.1) impish; urgency=medium
> >
> > * d/control:
>
>
> --
> https://code.launchpad.net/~lamoura/ubuntu/+source/ubuntu-advantage-tools/+git/ubuntu-advantage-tools/+merge/406232
> Your team Canonical Server Core Reviewers is requested to review the proposed merge of ~lamoura/ubuntu/+source/ubuntu-advantage-tools:upload-27.2.2-impish into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel.

[Lucas Kanashiro (lucaskanashiro)]

Lucas, thanks for removing the test changes, it will make the SRU team happy :) Also for appending .1 to the version string.

I rebuilt the package and ran autopkgtest against it locally and everything seems OK.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Package uploaded:

$ git push pkg upload/27.2.2_21.10.1
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 32 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.27 KiB | 1.27 MiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/ubuntu-advantage-tools
 * [new tag] upload/27.2.2_21.10.1 -> upload/27.2.2_21.10.1
$ dput ubuntu ../ubuntu-advantage-tools_27.2.2~21.10.1_source.changes
Checking signature on .changes
gpg: ../ubuntu-advantage-tools_27.2.2~21.10.1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../ubuntu-advantage-tools_27.2.2~21.10.1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_27.2.2~21.10.1.dsc: done.
  Uploading ubuntu-advantage-tools_27.2.2~21.10.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_27.2.2~21.10.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 2441322..266050a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ubuntu-advantage-tools (27.2.2~21.10.1) impish; urgency=medium
+
+  * d/tools.postinst:
+    - Do not fail in postinst if cloud-init did not run.
+      This fixes the regression introduced in 27.2.1. (LP: #1936833)
+
+ -- Lucas Moura <[e-mail]>  Tue, 27 Jul 2021 10:09:18 -0300
+
 ubuntu-advantage-tools (27.2.1~21.10.1) impish; urgency=medium
 
   * d/control:
diff --git a/debian/ubuntu-advantage-tools.postinst b/debian/ubuntu-advantage-tools.postinst
index bc3187f..f99c02e 100644
--- a/debian/ubuntu-advantage-tools.postinst
+++ b/debian/ubuntu-advantage-tools.postinst
@@ -291,7 +291,7 @@ notify_wrong_fips_metapackage_on_cloud() {
     fips_metapkg="ubuntu-fips"
 
     cloud_id=""
-    if command -v "cloud-id" > /dev/null ; then
+    if command -v "cloud-id" > /dev/null && [ -f /run/cloud-init/instance-data.json ] ; then
       cloud_id=$(cloud-id)
     fi