aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-04-20 18:25:56 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-05-11 12:45:16 +0200
commit0506ede84f97159a8156ad51aea395d0868e6141 (patch)
tree0be4cffcedd203c608449ccd88b4fed6ca3991f2 /docker/base
parent73c456f85b4e861e4be12282a67ca59f5f319357 (diff)
downloadkolla-0506ede84f97159a8156ad51aea395d0868e6141.tar.gz
kolla-0506ede84f97159a8156ad51aea395d0868e6141.zip
Drop ppc64le support
We do not test support for ppc64le on CI or other systems. In previous cycles it was used by TripleO and now they have own way. Change-Id: Ibd955869a6f9485dfa4d08a8ad2f4b28b7d59c15
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j225
-rw-r--r--docker/base/sources.list.ubuntu.ppc64le23
2 files changed, 0 insertions, 48 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 5ec3d2de3..76feca670 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -106,37 +106,12 @@ COPY dnf.conf /etc/dnf/dnf.conf
#
# 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
#
-{% elif base_arch == 'ppc64le' %}
- {% set base_yum_repo_files = [
- 'rabbitmq_rabbitmq-server.repo',
- ] %}
- # FIXME(mgoddard): Not available for CentOS 8 yet.
- #
- # 'elasticsearch.repo',
- #
-
- {% set base_yum_repo_keys = [
- ] %}
- # FIXME(mgoddard): Not available for CentOS 8 yet.
- #
- # 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
- #
{% endif %}
{%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %}
COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }}
{%- endfor %}
-# NOTE(hrw): 'rabbitmq-server' is 'noarch' so we can install it on ppc64le from
-# repo for other architecture.
-# NOTE(mjturek): tripleo-ci overrides these repos so the file would not exist
-# in that case. We test for the file's existence to avoid sed failing in that case.
-{% if base_arch == 'ppc64le' %}
-RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \
- sed -i -e 's/\$basearch/x86_64/g' /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo; \
- fi
-{% endif %}
-
{% block base_centos_repo_overrides_post_copy %}{% endblock %}
# Install what is needed for en_US.UTF-8
diff --git a/docker/base/sources.list.ubuntu.ppc64le b/docker/base/sources.list.ubuntu.ppc64le
deleted file mode 100644
index 53339b6c9..000000000
--- a/docker/base/sources.list.ubuntu.ppc64le
+++ /dev/null
@@ -1,23 +0,0 @@
-# Default repos
-deb http://ports.ubuntu.com/ focal main universe
-deb http://ports.ubuntu.com/ focal-updates main universe
-deb http://ports.ubuntu.com/ focal-security main universe
-
-# Backports have a lower priority and must be explicitly installed to be used
-deb http://ports.ubuntu.com/ focal-backports main universe
-
-# We need to add the repo for the updated packages they provide. The main ones
-# are qemu, libvirt, and openvswitch.
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/wallaby main
-
-# NOTE(hrw): repositories below are added into image when they are needed as
-# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
-# are defined in kolla/repos.yaml file.
-#
-# Here they stay in case someone needs them.
-
-# rabbitmq repo
-#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
-
-# MariaDB repo
-#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main