diff options
| author | Zuul <zuul@review.openstack.org> | 2018-12-19 13:48:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-12-19 13:48:02 +0000 |
| commit | e215e51fc1d908799b76bcf12fa92a7c95c1496a (patch) | |
| tree | 08fc4acfdba20d11628ccf2c4bd260189056cd2e /tests | |
| parent | 2c9abedc1a86c77c173ff194587bf8116d422541 (diff) | |
| parent | 0c4238da7c6566697c6773cd775ca6a74e3ab8c8 (diff) | |
| download | kolla-e215e51fc1d908799b76bcf12fa92a7c95c1496a.tar.gz kolla-e215e51fc1d908799b76bcf12fa92a7c95c1496a.zip | |
Merge "Use infra mirrors for ODL and percona repos"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/playbooks/run.yml | 3 | ||||
| -rw-r--r-- | tests/templates/kolla-build.conf.j2 | 3 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index 8c74b2012..b15ec45b9 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -8,8 +8,9 @@ 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_opendaylight_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/opendaylight/" + nodepool_cbs_centos_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/cbs.centos" nodepool_oraclelinux_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/oraclelinux/" + nodepool_percona_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/percona" tasks: - name: generate kolla inventory file copy: 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 %} |