diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-23 09:36:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-23 09:36:38 +0000 |
| commit | e3b2bb78084866a4b2c8966bacfd8ce47161dc18 (patch) | |
| tree | f49e1b1fb1f7964ac321eda74bbbe4ade5c81c4e /tests | |
| parent | 81c1f73511dc43e68af18140042b29dd726bad0d (diff) | |
| parent | 1d0c1e51af4c125902efd09b2aaf06fb1977df6b (diff) | |
| download | kolla-e3b2bb78084866a4b2c8966bacfd8ce47161dc18.tar.gz kolla-e3b2bb78084866a4b2c8966bacfd8ce47161dc18.zip | |
Merge "CI: Use docker mirror proxy"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/playbooks/run.yml | 12 | ||||
| -rw-r--r-- | tests/vars/zuul.yml | 1 |
2 files changed, 5 insertions, 8 deletions
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" |