Merge ~sergiodj/ubuntu/+source/ubuntu-fan:fix-https-proxy-impish into ubuntu/+source/ubuntu-fan:ubuntu/impish-devel

[Sergio Durigan Junior]

This MP fixes ubuntu-fan's "docker" dep8 test and makes it properly set the $https_proxy environment variable when running on autopkgtest.u.c.

This is the MP for Impish.

This problem came to our attention when the docker.io upload got blocked on Focal due to ubuntu-fan's failure to "docker pull" the Ubuntu image while running the aforementioned test. The problem is only reproducible when we run the test in the infrastructure, so it took a long time to debug. The interesting part is that this code has been like this forever, and although we can see some random failures in the past, for the most part it worked fine. I believe there was a recent change on docker.io that uncover this issue once and for all, and now we should fix it.

You can find a PPA with the proposed changes here:

https://launchpad.net/~sergiodj/+archive/ubuntu/ubuntu-fan-proxy-fix

You can take a look at the autopkgtest results attached to the PPA:

https://autopkgtest.ubuntu.com/results/autopkgtest-impish-sergiodj-ubuntu-fan-proxy-fix/?format=plain

[Lucas Kanashiro (lucaskanashiro)]

We have version 0.12.15 in Impish and Jammy, I think the best would be to use 0.12.15ubuntu0.21.10.1 to make explicit that this is being introduced in Impish. However, this version is still greater than the version in Jammy. Hopefully, we will have 0.12.16 in Jammy. WDYT?

[Sergio Durigan Junior (sergiodj)]

On Monday, April 11 2022, Lucas Kanashiro wrote:

> We have version 0.12.15 in Impish and Jammy, I think the best would be
> to use 0.12.15ubuntu0.21.10.1 to make explicit that this is being
> introduced in Impish. However, this version is still greater than the
> version in Jammy. Hopefully, we will have 0.12.16 in Jammy. WDYT?

Hm, I think we will need to wait for apw's reply on the Jammy MP before
going forward. I don't feel comfortable uploading a version that's
greater in Impish without knowing whether we will be able to bump the
Jammy version as well.

Thanks, Lucas.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Sergio Durigan Junior (sergiodj)]

I've adopted Lucas' suggestion regarding the version number. I've recently uploaded Jammy's package which will bump its version to 0.12.16 and resolve the conflict with Impish.

Uploaded:

$ dput ubuntu-fan_0.12.15ubuntu0.21.10.1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/ubuntu-fan/ubuntu-fan_0.12.15ubuntu0.21.10.1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/ubuntu-fan/ubuntu-fan_0.12.15ubuntu0.21.10.1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-fan_0.12.15ubuntu0.21.10.1.dsc: done.
  Uploading ubuntu-fan_0.12.15ubuntu0.21.10.1.tar.xz: done.
  Uploading ubuntu-fan_0.12.15ubuntu0.21.10.1_source.buildinfo: done.
  Uploading ubuntu-fan_0.12.15ubuntu0.21.10.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 6f9c9cb..3a4e0e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubuntu-fan (0.12.15ubuntu0.21.10.1) impish; urgency=medium
+
+  * d/t/docker: Don't use "https://" for $https_proxy.  Set
+    HTTPS_PROXY for docker.service as well. (LP: #1968387)
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 11 Apr 2022 15:26:05 -0400
+
 ubuntu-fan (0.12.15) hirsute; urgency=medium
 
   * Drop dh-systemd build dependency.
diff --git a/debian/tests/docker b/debian/tests/docker
index 9fa160b..94c7227 100644
--- a/debian/tests/docker
+++ b/debian/tests/docker
@@ -11,15 +11,15 @@ https_proxy=""
 if echo "" | nc -w 2 squid.internal 3128 >/dev/null 2>&1; then
 	INFO="Running in the Canonical CI environment"
 	http_proxy="http://squid.internal:3128"
-	https_proxy="https://squid.internal:3128"
+	https_proxy="http://squid.internal:3128"
 elif echo "" | nc -w 2 10.245.64.1 3128 >/dev/null 2>&1; then
 	INFO="Running in the Canonical enablement environment"
 	http_proxy="http://10.245.64.1:3128"
-	https_proxy="https://10.245.64.1:3128"
+	https_proxy="http://10.245.64.1:3128"
 elif echo "" | nc -w 2 91.189.89.216 3128 >/dev/null 2>&1; then
 	INFO="Running in the Canonical enablement environment"
 	http_proxy="http://91.189.89.216:3128"
-	https_proxy="https://91.189.89.216:3128"
+	https_proxy="http://91.189.89.216:3128"
 fi
 export http_proxy
 export https_proxy
@@ -36,8 +36,12 @@ if [ -n "$http_proxy" ]; then
 	if [ ! -d /etc/systemd/system/docker.service.d ]; then
 		mkdir /etc/systemd/system/docker.service.d
 	fi
-	echo -ne "[Service]\nEnvironment=\"HTTP_PROXY=$http_proxy\"\n" \
-		>/etc/systemd/system/docker.service.d/http-proxy.conf
+	cat > /etc/systemd/system/docker.service.d/http-proxy.conf << _EOF_
+[Service]
+Environment="HTTP_PROXY=$http_proxy"
+Environment="HTTPS_PROXY=$https_proxy"
+_EOF_
+
 	systemctl daemon-reload
 	systemctl restart docker.service
 fi