Merge ~canonical-kernel-team/+git/autotest-client-tests:sjf/docker_fix_lp2009351 into ~canonical-kernel-team/+git/autotest-client-tests:master

[Sean Feole]

ubuntu_docker_smoke && ubuntu_fan test: Proxy

BugLink: https://bugs.launchpad.net/bugs/2009351

- Append HTTPS_PROXY and NO_PROXY variables to docker http-proxy.conf
These values are required to allow communication with
registry-1.docker.io/v2/ when in the Openstack Cloud

- In the ubuntu fan test, remove the wget attempt for index.docker.io
The URI was invalid and returned a http 404 error, in this case
triggering the `else` and unsetting the http_proxy.

The check itself was not valid, due to Canonicals internal firewall
rules, index-docker and registry-docker are 2 separate acls and each
need to be configured for the network under test.

[Andrei Gherzan (agherzan)]

Looks good.

review: Approve

[Sean Feole (sfeole)]

The following was tested on Openstack Cloud to ensure HTTP Values were set. It was also tested in the AWS Cloud to ensure the HTTP Values were not set. Both tests passed as expected

[Francis Ginther (fginther)]

Thanks for testing on AWS.

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

LGTM, thanks!

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed.

diff --git a/ubuntu_docker_smoke_test/the-test b/ubuntu_docker_smoke_test/the-test
index 8810d15..9854e90 100755
--- a/ubuntu_docker_smoke_test/the-test
+++ b/ubuntu_docker_smoke_test/the-test
@@ -17,11 +17,14 @@ elif echo "" | nc -w 2 10.245.64.1 3128 >/dev/null 2>&1; then
     export http_proxy="http://10.245.64.1:3128"
 fi
 
+# Configure Docker Proxy LP2009351
 if [ -n "$http_proxy" ]; then
     command -v systemctl &> /dev/null
     if [ $? -eq 0 ]; then
         [ ! -d /etc/systemd/system/docker.service.d ] && mkdir /etc/systemd/system/docker.service.d
-        echo -e "[Service]\nEnvironment=HTTP_PROXY=$http_proxy\n" > /etc/systemd/system/docker.service.d/http-proxy.conf
+        echo -ne "[Service]\nEnvironment=HTTP_PROXY=$http_proxy\n" > /etc/systemd/system/docker.service.d/http-proxy.conf
+        echo -ne "Environment=HTTPS_PROXY=$http_proxy\n" >> /etc/systemd/system/docker.service.d/http-proxy.conf
+        echo -ne "Environment=NO_PROXY=127.0.0.1\n" >> /etc/systemd/system/docker.service.d/http-proxy.conf
         systemctl daemon-reload
         systemctl restart docker
     else
diff --git a/ubuntu_fan_smoke_test/ubuntu_fan_smoke_test.sh b/ubuntu_fan_smoke_test/ubuntu_fan_smoke_test.sh
index 8b10b85..c5f98e5 100755
--- a/ubuntu_fan_smoke_test/ubuntu_fan_smoke_test.sh
+++ b/ubuntu_fan_smoke_test/ubuntu_fan_smoke_test.sh
@@ -39,14 +39,6 @@ fi
 export http_proxy
 export https_proxy
 
-URI="http://index.docker.io/v1/repositories/library/ubuntu/images"
-if wget -q -O/dev/null $URI; then
-    echo $INFO
-else
-    unset http_proxy
-    unset https_proxy
-fi
-
 if [ -n "$http_proxy" ]; then
     if [ ! -d /etc/systemd/system/docker.service.d ]; then
         mkdir /etc/systemd/system/docker.service.d
@@ -58,8 +50,10 @@ if [ -n "$http_proxy" ]; then
     systemctl daemon-reload
     systemctl restart docker.service
 
-    echo -ne "[Service]\nEnvironment=\"HTTP_PROXY=$http_proxy\"\n" \
-         > /etc/systemd/system/docker.service.d/http-proxy.conf
+    # Configure Docker Proxy LP2009351
+    echo -ne "[Service]\nEnvironment=HTTP_PROXY=$http_proxy\n" > /etc/systemd/system/docker.service.d/http-proxy.conf
+    echo -ne "Environment=HTTPS_PROXY=$http_proxy\n" >> /etc/systemd/system/docker.service.d/http-proxy.conf
+    echo -ne "Environment=NO_PROXY=127.0.0.1\n" >> /etc/systemd/system/docker.service.d/http-proxy.conf
     systemctl daemon-reload
     systemctl restart docker.service
 fi