Merge ~lucaskanashiro/ubuntu/+source/docker.io:fix-autopkgtest-xenial into ubuntu/+source/docker.io:ubuntu/xenial-devel

[Lucas Kanashiro]

Fix autopkgtest failure in Xenial. The basic-smoke test relies on an image built based on Debian Stable but the GPG key used to sign the repository is not recognized by default in Ubuntu Xenial. The proposed change replace Debian Stable to Ubuntu Focal which works fine in a clean Ubuntu Xenial VM. Here is the log of the test failure:

https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-xenial/xenial/amd64/d/docker.io/20201218_135506_6bcc0@/log.gz

Here is a PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/containerd-upgrade-issue/+packages

autopkgtest is now happy with the proposed change:

autopkgtest [10:58:47]: @@@@@@@@@@@@@@@@@@@@ summary
basic-smoke PASS
docker-in-lxd PASS

[Richard Harding (rharding)]

I'm not sure why it was debian stable to start with but makes sense to use focal.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

This is the default in Debian and I think none wanted to introduce a delta since it was working fine, but now it is causing a "regression".

[Sergio Durigan Junior (sergiodj)]

LGTM as well.

[Lucas Kanashiro (lucaskanashiro)]

Thanks! Uploaded:

$ git push pkg upload/18.09.7-0ubuntu1_16.04.8
Enumerating objects: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 32 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 1.45 KiB | 741.00 KiB/s, done.
Total 10 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/docker.io
 * [new tag] upload/18.09.7-0ubuntu1_16.04.8 -> upload/18.09.7-0ubuntu1_16.04.8
$ dput ubuntu ../docker.io_18.09.7-0ubuntu1~16.04.8_source.changes
Checking signature on .changes
gpg: ../docker.io_18.09.7-0ubuntu1~16.04.8_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../docker.io_18.09.7-0ubuntu1~16.04.8.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading docker.io_18.09.7-0ubuntu1~16.04.8.dsc: done.
  Uploading docker.io_18.09.7-0ubuntu1~16.04.8.debian.tar.xz: done.
  Uploading docker.io_18.09.7-0ubuntu1~16.04.8_source.changes: done.
Successfully uploaded packages.

Unmerged commits

ad8a0db... by Lucas Kanashiro on 2021-01-04

changelog

1b9560f... by Lucas Kanashiro on 2021-01-04

d/t/basic-smoke: bootstrap Ubuntu Focal instead of Debian Stable

The GPG key used to sign the Debian Stable repository is not
recognized by default in Ubuntu Xenial which leads the test to a
failure. In order to fix that, bootstrap Ubuntu Focal which works
out-of-the-box.

diff --git a/debian/changelog b/debian/changelog
index a5be997..9bdf0b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+docker.io (18.09.7-0ubuntu1~16.04.8) xenial; urgency=medium
+
+  * d/t/basic-smoke: bootstrap Ubuntu Focal instead of Debian Stable.
+    The GPG key used to sign the Debian Stable repository is not
+    recognized by default in Ubuntu Xenial which leads the test to a
+    failure. In order to fix that, bootstrap Ubuntu Focal which works
+    out-of-the-box.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 04 Jan 2021 10:36:11 -0300
+
 docker.io (18.09.7-0ubuntu1~16.04.7) xenial; urgency=medium
 
   * d/p/do_not_bind_docker_to_containerd.patch: Update docker.io to not
diff --git a/debian/tests/basic-smoke b/debian/tests/basic-smoke
index ccf8825..ad82a88 100755
--- a/debian/tests/basic-smoke
+++ b/debian/tests/basic-smoke
@@ -11,12 +11,12 @@ docker version
 
 debootstrap \
 	--variant=minbase \
-	stable \
+	focal \
 	"$tempDir" \
-	http://httpredir.debian.org/debian
+	http://archive.ubuntu.com/ubuntu
 
-tar -cC "$tempDir" . | docker import - debian
-defer 'docker rmi debian'
+tar -cC "$tempDir" . | docker import - focal
+defer 'docker rmi focal'
 
-docker run --name test debian true
+docker run --name test focal true
 defer 'docker rm -f test'