[lxc-devel] [lxc-ci/master] test-lxd-docker improvements

[kolyshkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 351 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20171215/80a2d7fc/attachment.bin>
-------------- next part --------------
From 3727908ba237b351d35699e61c4e72cf8dedea27 Mon Sep 17 00:00:00 2001
From: Kirill Kolyshkin <kolyshkin at users.noreply.github.com>
Date: Fri, 15 Dec 2017 12:12:32 -0800
Subject: [PATCH 1/2] test-lxd-docker: quiet wget

Most of the CI output consists of wget printing its progress. Remove the clutter.

While at it, wrap binaries download into a loop.
---
 bin/test-lxd-docker | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/bin/test-lxd-docker b/bin/test-lxd-docker
index a938175..da27f32 100755
--- a/bin/test-lxd-docker
+++ b/bin/test-lxd-docker
@@ -35,14 +35,10 @@ systemctl stop docker.service
 systemctl stop docker.socket
 
 # Download binaries built from current git head of the Docker repo.
-wget https://master.dockerproject.org/linux/x86_64/docker -O /usr/bin/docker
-wget https://master.dockerproject.org/linux/x86_64/dockerd -O /usr/bin/dockerd
-wget https://master.dockerproject.org/linux/x86_64/docker-containerd -O /usr/bin/docker-containerd
-wget https://master.dockerproject.org/linux/x86_64/docker-containerd-shim -O /usr/bin/docker-containerd-shim
-wget https://master.dockerproject.org/linux/x86_64/docker-init -O /usr/bin/docker-init
-wget https://master.dockerproject.org/linux/x86_64/docker-proxy -O /usr/bin/docker-proxy
-wget https://master.dockerproject.org/linux/x86_64/docker-runc -O /usr/bin/docker-runc
-chmod +x /usr/bin/docker*
+for BIN in docker dockerd docker-containerd docker-containerd-shim docker-init docker-proxy docker-runc; do
+    wget -q "https://master.dockerproject.org/linux/x86_64/${BIN}" -O "/usr/bin/${BIN}" && \
+        chmod +x "/usr/bin/${BIN}"
+done
 
 # Start docker again
 systemctl start docker

From 7262fd230bdd1d60086d8cc256a284c85cdf791e Mon Sep 17 00:00:00 2001
From: Kirill Kolyshkin <kolyshkin at users.noreply.github.com>
Date: Fri, 15 Dec 2017 12:14:25 -0800
Subject: [PATCH 2/2] test-lxd-docker: add docker info

It is useful to see which version of docker is being tested, in what environment etc.
---
 bin/test-lxd-docker | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/test-lxd-docker b/bin/test-lxd-docker
index da27f32..b81e6a9 100755
--- a/bin/test-lxd-docker
+++ b/bin/test-lxd-docker
@@ -50,6 +50,9 @@ docker pull busybox:latest
 # Test whether we can remove a simple Docker image.
 docker rmi busybox:latest
 
+# Show docker info (client and daemon version, etc.)
+docker info
+
 # Run a basic hello-world
 docker run hello-world
 EOF