diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-05 12:28:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-05 12:28:00 +0000 |
| commit | c6b88c581dd7e856dcc241c4b46210e50face7dd (patch) | |
| tree | 4a63d6b0a0146f01c2524b72d0067ddb529bbffa | |
| parent | c4c91e4fe8d66c3bebf7b1ddf4ee2c9a24402a01 (diff) | |
| parent | e7e0adad6da25fbaa827db9309a22ae4ec377c5a (diff) | |
| download | kolla-c6b88c581dd7e856dcc241c4b46210e50face7dd.tar.gz kolla-c6b88c581dd7e856dcc241c4b46210e50face7dd.zip | |
Merge "CI: Clean up Zuul repo mirrors for CentOS"
| -rw-r--r-- | tests/templates/template_overrides.j2 | 24 | ||||
| -rw-r--r-- | tests/vars/zuul.yml | 4 |
2 files changed, 15 insertions, 13 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 38042ce62..22baa2a56 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -21,7 +21,7 @@ RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow- {% elif base_distro == 'centos' %} {% endraw %} -RUN sed -i -e "/^mirrorlist/d" \ +RUN sed -i -e "/^mirrorlist/ d" \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ /etc/yum.repos.d/CentOS-Base.repo @@ -33,15 +33,19 @@ RUN sed -i -e "/^mirrorlist/d" \ {% if base_distro == "centos" %} {% endraw %} -RUN sed -i -e "/^mirrorlist/d" \ - -e "/^metalink/d" \ - -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|g" \ - -e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ - -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ - -e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \ - -e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \ - -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \ - -e "s|^baseurl=https://cbs.centos.org/repos|baseurl={{ nodepool_cbs_centos_proxy }}|g" \ +## NOTE(yoctozepto): GPG key location is replaced for Percona repo only +## TODO(yoctozepto): CentOS hits external EPEL repo for its repo package (epel-release-*.rpm), should use the mirrored +RUN sed -i \ + -e "/^mirrorlist/ d" \ + -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ + /etc/yum.repos.d/CentOS-*.repo \ + && sed -i \ + -e "/^metalink/ d" \ + -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \ + /etc/yum.repos.d/epel*.repo \ + && sed -i \ + -e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \ + -e "s|https://cbs.centos.org/repos|{{ nodepool_cbs_centos_proxy }}|g" \ -e "s|https://repo.percona.com|{{ nodepool_percona_proxy }}|g" \ /etc/yum.repos.d/*.repo diff --git a/tests/vars/zuul.yml b/tests/vars/zuul.yml index 2465a3f79..68c35e69b 100644 --- a/tests/vars/zuul.yml +++ b/tests/vars/zuul.yml @@ -1,9 +1,7 @@ --- -nodepool_rdo_proxy: "{{ zuul_site_mirror_fqdn }}:8080/rdo" +nodepool_rdo_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/rdo" 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_elastic_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/elastic/" -nodepool_grafana_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/grafana/" nodepool_cbs_centos_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/cbs.centos" nodepool_percona_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/percona" |