summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2019-06-25 19:29:46 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2019-06-25 19:29:46 +0200
commitccabadc342477b3c16b11ae52e0194c7916966c2 (patch)
treea34e1e81bc2f5730df0e5fe74c77f08d1785f50c /tests
parent2777a0c0584e4c707c56ca6aaa8cf2f41a473a83 (diff)
downloadkolla-ccabadc342477b3c16b11ae52e0194c7916966c2.tar.gz
kolla-ccabadc342477b3c16b11ae52e0194c7916966c2.zip
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/playbooks/run.yml1
-rw-r--r--tests/templates/template_overrides.j223
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 %}