diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-10 15:12:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-10 15:12:01 +0000 |
| commit | b5c8b595a7f9c4aebb35b0ceacc236ec5f4eb350 (patch) | |
| tree | 26a388d4b47a60367f55e7cfc368200131da39d2 /tests | |
| parent | e03558cc4113f9c3a376d4e64779f6c610f7519b (diff) | |
| parent | de58339a0e1704ae1ade4e032a73bb4708ecfaf1 (diff) | |
| download | kolla-b5c8b595a7f9c4aebb35b0ceacc236ec5f4eb350.tar.gz kolla-b5c8b595a7f9c4aebb35b0ceacc236ec5f4eb350.zip | |
Merge "Fix issues with Percona in Zuul and clean up a little bit"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/template_overrides.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index f845f571e..2f9429b0d 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -49,7 +49,7 @@ RUN sed -i -e "/^mirrorlist/d" \ -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" \ - -e "s|^baseurl=https://repo.percona.com|baseurl={{ nodepool_percona_proxy }}|g" \ + -e "s|https://repo.percona.com|{{ nodepool_percona_proxy }}|g" \ /etc/yum.repos.d/*.repo {% raw %} @@ -65,15 +65,17 @@ RUN sed -i -e "/^mirrorlist/d" \ -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" \ - -e "s|^baseurl=https://repo.percona.com|baseurl={{ nodepool_percona_proxy }}|g" \ + -e "s|https://repo.percona.com|{{ nodepool_percona_proxy }}|g" \ /etc/yum.repos.d/*.repo {% raw %} {% elif base_distro == "ubuntu" %} {% endraw %} +## TODO(yoctozepto): replace base repo earlier as well (like RHEL-based do) RUN sed -i -e "s|http://archive.ubuntu.com|http://{{ nodepool_mirror_host }}|" \ -e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \ + -e "s|http://repo.percona.com|{{ nodepool_percona_proxy }}|" \ /etc/apt/sources.list \ && apt-get update |