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 | |
| parent | 81c1f73511dc43e68af18140042b29dd726bad0d (diff) | |
| parent | 1d0c1e51af4c125902efd09b2aaf06fb1977df6b (diff) | |
| download | kolla-e3b2bb78084866a4b2c8966bacfd8ce47161dc18.tar.gz kolla-e3b2bb78084866a4b2c8966bacfd8ce47161dc18.zip | |
Merge "CI: Use docker mirror proxy"
| -rw-r--r-- | tests/playbooks/run.yml | 12 | ||||
| -rw-r--r-- | tests/vars/zuul.yml | 1 | ||||
| -rwxr-xr-x | tools/setup_Debian.sh | 4 | ||||
| -rwxr-xr-x | 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 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" diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index 3a7e067c5..3fa8db98d 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 67f4ca9bb..1c96100a0 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 |