openstack
/
kolla
Code Issues Proposed changes

Remove Oracle Linux stuff in CI code 

Oracle Linux is no longer tested via CI after [1].
This patch removes OL support from Zuul files.

[1] https://review.opendev.org/664217

Change-Id: I527aba3635ef82e2d2a88ee7f5250bf03e420800
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
This commit is contained in:
Radosław Piliszek 2019-06-25 19:29:46 +02:00
parent 2777a0c058
commit ccabadc342
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/playbooks/run.yml
View File

@ -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

23
tests/templates/template_overrides.j2
View File

@ -25,13 +25,6 @@ RUN sed -i -e "/^mirrorlist/d" \
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
/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 %}
@ -52,22 +45,6 @@ RUN sed -i -e "/^mirrorlist/d" \
-e "s|https://repo.percona.com|{{ nodepool_percona_proxy }}|g" \
/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 %}