diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-27 14:05:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-27 14:05:58 +0000 |
| commit | 6e783767799714af010445a2d74e244f3aa713aa (patch) | |
| tree | 49cef887f4a3851bba3304d1d4f5f2f61ab3f7fa | |
| parent | 331bcd016f277b1e16451b56e25c19a3e4963107 (diff) | |
| parent | ccabadc342477b3c16b11ae52e0194c7916966c2 (diff) | |
| download | kolla-6e783767799714af010445a2d74e244f3aa713aa.tar.gz kolla-6e783767799714af010445a2d74e244f3aa713aa.zip | |
Merge "Remove Oracle Linux stuff in CI code"
| -rw-r--r-- | tests/playbooks/run.yml | 1 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 23 |
2 files changed, 0 insertions, 24 deletions
diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index b15ec45b9..b81c4f5e3 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -9,7 +9,6 @@ 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_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 diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 2f9429b0d..38042ce62 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -26,13 +26,6 @@ RUN sed -i -e "/^mirrorlist/d" \ /etc/yum.repos.d/CentOS-Base.repo {% raw %} -{% elif base_distro == 'oraclelinux' %} -{% endraw %} - -RUN sed -i -e "s|^baseurl=https://yum$ociregion.oracle.com/repo/OracleLinux|baseurl={{ nodepool_oraclelinux_proxy }}|" \ - /etc/yum.repos.d/oracle-linux-ol7.repo - -{% raw %} {% endif %} {% endblock %} @@ -53,22 +46,6 @@ RUN sed -i -e "/^mirrorlist/d" \ /etc/yum.repos.d/*.repo {% raw %} -{% elif base_distro == "oraclelinux" %} -{% endraw %} - -RUN sed -i -e "/^mirrorlist/d" \ - -e "/^metalink/d" \ - -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ - -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=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|https://repo.percona.com|{{ nodepool_percona_proxy }}|g" \ - /etc/yum.repos.d/*.repo - -{% raw %} {% elif base_distro == "ubuntu" %} {% endraw %} |