diff options
Diffstat (limited to 'tests/templates')
| -rw-r--r-- | tests/templates/kolla-build.conf.j2 | 3 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2 index 994c58371..3f9e5d04c 100644 --- a/tests/templates/kolla-build.conf.j2 +++ b/tests/templates/kolla-build.conf.j2 @@ -7,6 +7,3 @@ tag = {{ zuul.tag if zuul.pipeline == "release" else zuul.branch | basename }} push = false logs_dir = /tmp/logs/build template_override = /etc/kolla/template_overrides.j2 - -[opendaylight] -location = {{ nodepool_opendaylight_proxy}}/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 73a217b3d..bbc77d5b8 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -44,6 +44,8 @@ RUN sed -i -e "/^mirrorlist/d" \ -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" \ + -e "s|^baseurl=https://repo.percona.com|baseurl={{ nodepool_percona_proxy }}|g" \ /etc/yum.repos.d/*.repo {% raw %} @@ -58,6 +60,8 @@ RUN sed -i -e "/^mirrorlist/d" \ -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" \ + -e "s|^baseurl=https://repo.percona.com|baseurl={{ nodepool_percona_proxy }}|g" \ /etc/yum.repos.d/*.repo {% raw %} |
