diff options
| -rw-r--r-- | docker/base/percona-release.repo | 4 | ||||
| -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 |
4 files changed, 8 insertions, 6 deletions
diff --git a/docker/base/percona-release.repo b/docker/base/percona-release.repo index b7d5c54b8..6d6e0d26a 100644 --- a/docker/base/percona-release.repo +++ b/docker/base/percona-release.repo @@ -1,13 +1,13 @@ [percona-release-$basearch] name = Percona-Release YUM repository - $basearch -baseurl = http://repo.percona.com/release/$releasever/RPMS/$basearch +baseurl = https://repo.percona.com/release/$releasever/RPMS/$basearch enabled = 0 gpgcheck = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Percona [percona-release-noarch] name = Percona-Release YUM repository - noarch -baseurl = http://repo.percona.com/release/$releasever/RPMS/noarch +baseurl = https://repo.percona.com/release/$releasever/RPMS/noarch enabled = 0 gpgcheck = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Percona 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 %} |