Skip to content

Commit 0506ede

Browse files
committed
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
1 parent 73c456f commit 0506ede

File tree

11 files changed

+9
-125
lines changed

11 files changed

+9
-125
lines changed

doc/source/contributor/adding-a-new-image.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ be built for some distribution/architecture/build-type combinations.
7777
"bifrost-base", # someone need to get upstream working first
7878
},
7979
80-
'ppc64le': {
81-
"elasticsearch", # no binary package
82-
},
83-
8480
'binary': {
8581
"bifrost-base",
8682
"blazar-base",

doc/source/support_matrix.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ aarch64 images
7474
:stub-columns: 1
7575
:file: ./matrix_aarch64.csv
7676

77-
ppc64le images
78-
==============
79-
80-
.. note:: TODO
81-
8277
.. _unbuildable-images-list:
8378

8479
Currently unbuildable images

docker/base/Dockerfile.j2

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -106,37 +106,12 @@ COPY dnf.conf /etc/dnf/dnf.conf
106106
#
107107
# 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
108108
#
109-
{% elif base_arch == 'ppc64le' %}
110-
{% set base_yum_repo_files = [
111-
'rabbitmq_rabbitmq-server.repo',
112-
] %}
113-
# FIXME(mgoddard): Not available for CentOS 8 yet.
114-
#
115-
# 'elasticsearch.repo',
116-
#
117-
118-
{% set base_yum_repo_keys = [
119-
] %}
120-
# FIXME(mgoddard): Not available for CentOS 8 yet.
121-
#
122-
# 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
123-
#
124109
{% endif %}
125110

126111
{%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %}
127112
COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }}
128113
{%- endfor %}
129114

130-
# NOTE(hrw): 'rabbitmq-server' is 'noarch' so we can install it on ppc64le from
131-
# repo for other architecture.
132-
# NOTE(mjturek): tripleo-ci overrides these repos so the file would not exist
133-
# in that case. We test for the file's existence to avoid sed failing in that case.
134-
{% if base_arch == 'ppc64le' %}
135-
RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \
136-
sed -i -e 's/\$basearch/x86_64/g' /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo; \
137-
fi
138-
{% endif %}
139-
140115
{% block base_centos_repo_overrides_post_copy %}{% endblock %}
141116

142117
# Install what is needed for en_US.UTF-8

docker/base/sources.list.ubuntu.ppc64le

Lines changed: 0 additions & 23 deletions
This file was deleted.

docker/collectd/Dockerfile.j2

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
6060
'python3-sqlalchemy-collectd'
6161
] %}
6262

63-
{% if base_arch in ['x86_64', 'ppc64le'] %}
64-
{% set collectd_packages = collectd_packages + [
65-
'collectd-iptables'
66-
] %}
67-
{% endif %}
68-
6963
{% if base_arch =='x86_64' %}
7064
{% set collectd_packages = collectd_packages + [
7165
'collectd-hugepages',
66+
'collectd-iptables',
7267
'collectd-pmu',
7368
'collectd-rdt',
7469
'collectd-turbostat'

docker/ironic/ironic-pxe/Dockerfile.j2

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
99

1010
{% if base_package_type == 'rpm' %}
1111
{% set ironic_pxe_packages = [
12+
'grub2-tools',
13+
'grub2-efi-aa64-modules',
1214
'ipxe-bootimgs',
1315
'tftp-server',
1416
] %}
1517

16-
{% if base_arch in ['x86_64', 'ppc64le'] %}
18+
{% if base_arch in ['x86_64'] %}
1719
{% set ironic_pxe_packages = ironic_pxe_packages + [
1820
'syslinux-tftpboot'
1921
] %}
2022
{% endif %}
2123

22-
# NOTE(hrw): RHEL and CentOS ship those packages on all grub architectures
23-
# (x86_64, ppc64le, aarch64, but not s390x), and therefore can be used on
24-
# any of them to support heterogeneous clusters with AArch64.
25-
{% if base_arch != 's390x' %}
26-
{% set ironic_pxe_packages = ironic_pxe_packages + [
27-
'grub2-tools',
28-
'grub2-efi-aa64-modules'
29-
] %}
30-
{% endif %}
31-
3224
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
3325
{% elif base_package_type == 'deb' %}
3426
{% set ironic_pxe_packages = [

docker/nova/nova-base/Dockerfile.j2

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2626
{% set nova_base_packages = nova_base_packages + [
2727
'edk2-aarch64'
2828
] %}
29-
{% elif base_arch == 'ppc64le' %}
30-
{# NOTE(Jeffrey4l): no packages for ppc64le #}
3129
{% endif %}
3230

3331
{% elif base_package_type == 'deb' %}
@@ -46,8 +44,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
4644
{% set nova_base_packages = nova_base_packages + [
4745
'qemu-efi',
4846
] %}
49-
{% elif base_arch == 'ppc64le' %}
50-
{# NOTE(Jeffrey4l): no packages for ppc64le #}
5147
{% endif %}
5248
{% endif %}
5349

@@ -67,8 +63,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
6763
{% set nova_base_packages = nova_base_packages + [
6864
'edk2-aarch64'
6965
] %}
70-
{% elif base_arch == 'ppc64le' %}
71-
{# NOTE(Jeffrey4l): no packages for ppc64le #}
7266
{% endif %}
7367

7468
{% elif base_package_type == 'deb' %}
@@ -90,8 +84,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
9084
{% set nova_base_packages = nova_base_packages + [
9185
'qemu-efi',
9286
] %}
93-
{% elif base_arch == 'ppc64le' %}
94-
{# NOTE(Jeffrey4l): no packages for ppc64le #}
9587
{% endif %}
9688

9789
{% endif %}

kolla/common/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222
BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'debian']
23-
BASE_ARCH = ['x86_64', 'ppc64le', 'aarch64']
23+
BASE_ARCH = ['x86_64', 'aarch64']
2424
DEFAULT_BASE_TAGS = {
2525
'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream8'},
2626
'rhel': {'name': 'registry.access.redhat.com/ubi8', 'tag': 'latest'},

kolla/image/build.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,6 @@ class Status(Enum):
8686
"skydive-base", # no aarch64 binary
8787
},
8888

89-
'ppc64le': {
90-
"elasticsearch", # no binary package
91-
"grafana", # no binary package
92-
"monasca-grafana", # no phantomJS
93-
"prometheus-base", # no ppc64le binaries
94-
"skydive-base", # no ppc64le binaries
95-
"telegraf", # no binary package
96-
"xtrabackup", # no binary package
97-
},
98-
9989
'binary': {
10090
"bifrost-base",
10191
"blazar-base",
@@ -115,12 +105,6 @@ class Status(Enum):
115105
"tempest", # same reason as 'monasca-base'
116106
},
117107

118-
'source+ppc64le': {
119-
"monasca-base", # pypi 'confluent-kafka' requires newer libfdkafka-dev
120-
# than distributions have
121-
"tempest", # same reason as 'monasca-base'
122-
},
123-
124108
'centos': {
125109
"hacluster-pcs", # Missing crmsh package
126110
"nova-spicehtml5proxy", # Missing spicehtml5 package
@@ -151,12 +135,6 @@ class Status(Enum):
151135
"telegraf", # no binary package
152136
},
153137

154-
'centos+ppc64le': {
155-
"hacluster-pcs", # no binary package
156-
"influxdb", # no binary package
157-
"kibana", # no binary package
158-
},
159-
160138
"centos+binary": {
161139
"masakari-base",
162140
},
@@ -676,8 +654,6 @@ def __init__(self, conf):
676654
self.debian_arch = 'arm64'
677655
elif self.base_arch == 'x86_64':
678656
self.debian_arch = 'amd64'
679-
elif self.base_arch == 'ppc64le':
680-
self.debian_arch = 'ppc64el'
681657
self.images = list()
682658
self.openstack_release = conf.openstack_release
683659
self.docker_healthchecks = conf.docker_healthchecks

kolla/template/repos.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,6 @@ centos-aarch64:
3737
rabbitmq: "rabbitmq_rabbitmq-server"
3838
td-agent: "treasuredata"
3939

40-
centos-ppc64le:
41-
ceph: "centos-ceph-nautilus"
42-
elasticsearch: "elasticsearch-kibana-logstash-7.x"
43-
epel: "epel"
44-
epel-modular: "epel-modular"
45-
extras: "extras"
46-
hacluster: "ha"
47-
libvirt: "centos-advanced-virtualization"
48-
logstash: "elasticsearch-kibana-logstash-7.x"
49-
openvswitch: "centos-nfv-openvswitch"
50-
opstools: "centos-opstools"
51-
powertools: "powertools"
52-
rabbitmq: "rabbitmq_rabbitmq-server"
53-
5440
rhel:
5541
erlang: "centos-rabbitmq-38"
5642
hacluster: "ha"
@@ -99,7 +85,3 @@ ubuntu-aarch64:
9985
mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
10086
rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"
10187
td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
102-
103-
ubuntu-ppc64le:
104-
mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
105-
rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"

0 commit comments

Comments
 (0)