From 1d0c1e51af4c125902efd09b2aaf06fb1977df6b Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Thu, 19 Sep 2019 09:09:05 +0200 Subject: 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 --- tests/playbooks/run.yml | 12 ++++-------- tests/vars/zuul.yml | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index d22a38870..cd2f5ca8c 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 524f38a60..2bf75d64d 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" -- cgit v1.2.3