Merge ~lucaskanashiro/ubuntu/+source/ubuntu-fan:fix-autopkgtest into ubuntu/+source/ubuntu-fan:ubuntu/devel

Proposed by Lucas Kanashiro
Status: Merged
Merge reported by: Lucas Kanashiro
Merged at revision: 40b862c4b12eab0c23340814996b48f81b163cf7
Proposed branch: ~lucaskanashiro/ubuntu/+source/ubuntu-fan:fix-autopkgtest
Merge into: ubuntu/+source/ubuntu-fan:ubuntu/devel
Diff against target: 23 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/tests/control (+1/-1)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior (community) Approve
Canonical Server Pending
Review via email: mp+396776@code.launchpad.net

Description of the change

Fix autopkgtest failure on amd64 blocking docker.io migration. This is the test log:

https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-hirsute/hirsute/amd64/u/ubuntu-fan/20210121_190359_0ef80@/log.gz

The test is working fine locally and it is a proxy issue in the Ubuntu's autopkgtest infrastructure.

Here is a PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/ubuntu-fan/+packages

And the test log of an autopkgtest run with the package from the PPA:

https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-hirsute-lucaskanashiro-ubuntu-fan/hirsute/amd64/u/ubuntu-fan/20210122_160631_a87a8@/log.gz

autopkgtest [16:06:17]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS
lxd PASS

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks for the MP, Lucas.

I talked to him in private and asked why not handle no_proxy inside the "docker" script, since it already has code in place to deal with http{,s}_proxy as well. He told me that he attempted that, but it strangely doesn't work.

As for the value chosen for no_proxy, according to:

https://www.gnu.org/software/wget/manual/html_node/Proxies.html

it should contain a comma-separated list of domain suffixes. Maybe a better value for it would be ".internal,$no_proxy"? I haven't really tested.

Anywa, I don't think it's worth spending too much time on this, and his solution seems to work fine, so I'm approving this MP.

review: Approve
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

Thanks Sergion. Uploaded:

$ git push pkg upload/0.12.14
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.23 KiB | 1.23 MiB/s, done.
Total 10 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/ubuntu-fan
 * [new tag] upload/0.12.14 -> upload/0.12.14
$ dput ubuntu ../ubuntu-fan_0.12.14_source.changes
Checking signature on .changes
gpg: ../ubuntu-fan_0.12.14_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../ubuntu-fan_0.12.14.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-fan_0.12.14.dsc: done.
  Uploading ubuntu-fan_0.12.14.tar.xz: done.
  Uploading ubuntu-fan_0.12.14_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 8d2628c..b990ae6 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+ubuntu-fan (0.12.14) hirsute; urgency=medium
7+
8+ * d/t/control: add squid.internal to $no_proxy in the docker test.
9+
10+ -- Lucas Kanashiro <kanashiro@ubuntu.com> Fri, 22 Jan 2021 16:33:15 -0300
11+
12 ubuntu-fan (0.12.13) eoan; urgency=medium
13
14 * d/t/control: Fix missing dependencies for autopkgtests (LP: #1832238)
15diff --git a/debian/tests/control b/debian/tests/control
16index 8a76d7b..c79b173 100644
17--- a/debian/tests/control
18+++ b/debian/tests/control
19@@ -1,4 +1,4 @@
20-Tests: docker
21+Test-Command: no_proxy=squid.internal,$no_proxy docker
22 Depends: ubuntu-fan, docker.io, bridge-utils, net-tools
23 Restrictions: needs-root, isolation-machine, allow-stderr
24

Subscribers

People subscribed via source and target branches