From 1d0c1e51af4c125902efd09b2aaf06fb1977df6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Thu, 19 Sep 2019 09:09:05 +0200
Subject: [PATCH] CI: Use docker mirror proxy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TODO: Debian build still requires access to original repo.

Change-Id: Ie4bac5334369a63793d36568a9d3a58a0cdc7667
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
---
 tests/playbooks/run.yml | 12 ++++--------
 tests/vars/zuul.yml     |  1 +
 tools/setup_Debian.sh   |  4 ++--
 tools/setup_RedHat.sh   | 10 +++++++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml
index d22a388702..cd2f5ca8c0 100644
--- a/tests/playbooks/run.yml
+++ b/tests/playbooks/run.yml
@@ -3,15 +3,11 @@
   vars_files:
     - ../vars/zuul.yml
   tasks:
-    - name: copy setup script
-      copy:
-        src: "{{ zuul.executor.work_root }}/{{ zuul.project.src_dir }}/tools/setup_{{ ansible_os_family }}.sh"
-        dest: /tmp/setup.sh
-        mode: 0755
-
-    - name: run node setup script
-      shell: /tmp/setup.sh
+    - name: Run node setup script
+      script: "{{ zuul.executor.work_root }}/{{ zuul.project.src_dir }}/tools/setup_{{ ansible_os_family }}.sh"
       become: true
+      environment:
+        DOCKER_REPOS_MIRROR_URL: "{{ nodepool_docker_proxy }}"
 
     - name: changing permission of Docker socket to 666
       file:
diff --git a/tests/vars/zuul.yml b/tests/vars/zuul.yml
index 524f38a607..2bf75d64d9 100644
--- a/tests/vars/zuul.yml
+++ b/tests/vars/zuul.yml
@@ -4,3 +4,4 @@ nodepool_pypi_mirror: "http://{{ zuul_site_mirror_fqdn }}:8080/pypi/simple"
 nodepool_mirror_host: "{{ zuul_site_mirror_fqdn }}"
 nodepool_npmjs_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/registry.npmjs/"
 nodepool_cbs_centos_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/cbs.centos"
+nodepool_docker_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/docker"
diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh
index 3a7e067c5d..3fa8db98d6 100755
--- a/tools/setup_Debian.sh
+++ b/tools/setup_Debian.sh
@@ -61,8 +61,8 @@ distro_codename=$(lsb_release -cs)
 
 sudo apt-get update
 sudo apt-get -y install apt-transport-https
-sudo add-apt-repository "deb https://download.docker.com/linux/${distro_id} ${distro_codename} stable"
-curl -fsSL https://download.docker.com/linux/${distro_id}/gpg | sudo apt-key add -
+sudo add-apt-repository "deb $DOCKER_REPOS_MIRROR_URL/${distro_id} ${distro_codename} stable"
+curl -fsSL $DOCKER_REPOS_MIRROR_URL/${distro_id}/gpg | sudo apt-key add -
 sudo apt-get update
 sudo apt-get -y install --no-install-recommends docker-ce
 
diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh
index 67f4ca9bb6..1c96100a03 100755
--- a/tools/setup_RedHat.sh
+++ b/tools/setup_RedHat.sh
@@ -6,9 +6,13 @@ set -o errexit
 # (SamYaple)TODO: Remove the path overriding
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
-sudo yum-config-manager \
-    --add-repo \
-    https://download.docker.com/linux/centos/docker-ce.repo
+sudo tee /etc/yum.repos.d/docker-ce-stable.repo << EOF
+[docker-ce-stable]
+baseurl=$DOCKER_REPOS_MIRROR_URL/centos/7/\$basearch/stable
+enabled=1
+gpgcheck=1
+gpgkey=$DOCKER_REPOS_MIRROR_URL/centos/gpg
+EOF
 
 sudo yum -y install libffi-devel openssl-devel docker-ce btrfs-progs