Skip to content

Commit d67bf58

Browse files
hrwMarcin Juszkiewicz
hrw
authored and
Marcin Juszkiewicz
committed
rabbitmq: update to RabbitMQ 3.9 on Erlang 25
Wallaby provides RabbitMQ 3.8 series with Erlang 23. Both are not supported anymore. This patch brings RabbitMQ up to 3.9 series with Erlang 25. Due to fact that 3.8 does not support Erlang 25 we do all updates at once. Therefore this commit is composed of 3 backports from stable/yoga branch: RabbitMQ 3.9 and Erlang 25 are final update in stable/wallaby branch. According to upstream [1] 3.8 -> 3.9 migration is fine while 3.8 -> 3.10 should be done through 3.9 so we can not move to 3.10 version here. 1. https://www.rabbitmq.com/upgrade.html#rabbitmq-version-upgradability ------------------------------------------------------------------------ rabbitmq: use Erlang from PPA on Debian/Ubuntu PPA from Team RabbitMQ [1] provides newer Erlang for Debian/Ubuntu. This way we have latest Erlang on both distributions and both architectures. 1. https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang (manual cherry-pick from master commit b40506f) Id: I6b1407cc94ffa1893dac204cf4836a7d0ae0d575 ------------------------------------------------------------------------ rabbitmq: bump Erlang version to 25.x We decided to ship one Erlang version for all distributions and architectures. RabbitMQ 3.9.22+ requires Erlang 24.2+ and 24.3.4.2+ is recommended due to CVE-2022-37026. Id: I1eb1e1bd2bf74dbef214d458cbde13aa8c2a286f ------------------------------------------------------------------------ rabbitmq/aarch64: use COPR for Erlang RabbitMQ team maintains RPM package in Github repo [1]. Hrw then use it to build package using COPR service [2]. This way we have latest Erlang on both distributions and both architectures. 1. https://github.com/rabbitmq/erlang-rpm/ 2. https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/ (manual cherry-pick from master commit e104ef7) Id: I6a6a9c3d5ffff884fc61baeafcc46ad82afc3db3 ------------------------------------------------------------------------ (manual backport from stable/xena) Change-Id: I3e2b37f106ccc096a7aede7b07197219373610e9
1 parent 3c0c7e3 commit d67bf58

File tree

8 files changed

+28
-24
lines changed

8 files changed

+28
-24
lines changed

‎docker/base/Dockerfile.j2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
9393
{% elif base_arch == 'aarch64' %}
9494
{% set base_yum_repo_files = [
9595
'elasticsearch.repo',
96-
'erlang-solutions.repo',
96+
'hrw-copr-erlang-for-rabbitmq.repo',
9797
'grafana.repo',
9898
'rabbitmq_rabbitmq-server.repo',
9999
'td.repo',
@@ -356,8 +356,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
356356
{# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <[email protected]> #}
357357
{# A20F259AEB9C94BB -- Sensuapp (Freight) <[email protected]> #}
358358
{# F1656F24C74CD1D8 -- MariaDB Signing Key <[email protected]> #}
359-
{# E495BB49CC4BBE5B -- Cloudsmith RabbitMQ Erlang repository key #}
360359
{# 9F4587F226208342 -- Cloudsmith RabbitMQ repository key #}
360+
{# F77F1EDA57EBB1CC -- Team RabbitMQ Erlang PPA #}
361361
{% set base_apt_keys = [
362362
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
363363
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
@@ -367,8 +367,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
367367
'901F9177AB97ACBE',
368368
'A20F259AEB9C94BB',
369369
'F1656F24C74CD1D8',
370-
'E495BB49CC4BBE5B',
371370
'9F4587F226208342',
371+
'F77F1EDA57EBB1CC',
372372
] %}
373373
{% set base_remote_apt_keys = [
374374
'https://packages.grafana.com/gpg.key',
@@ -378,8 +378,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
378378
{% set base_apt_keys = [
379379
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
380380
'F1656F24C74CD1D8',
381-
'E495BB49CC4BBE5B',
382381
'9F4587F226208342',
382+
'F77F1EDA57EBB1CC',
383383
] %}
384384
{% set base_remote_apt_keys = [
385385
'https://download.docker.com/linux/debian/gpg',

‎docker/base/apt_preferences.debian‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
Package: rabbitmq-server
2-
Pin: version 3.8.*
2+
Pin: version 3.9.*
33
Pin-Priority: 1000
44

5-
# RabbitMQ wants 23+ and we want to stay on 23 if possible
65
Package: erlang*
7-
Pin: version 1:23.*
6+
Pin: version 1:25.*
87
Pin-Priority: 1000
98

109
# NOTE(mgoddard): logstash 7.9.x is the last version that supports

‎docker/base/apt_preferences.ubuntu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Package: rabbitmq-server
2-
Pin: version 3.8.*
2+
Pin: version 3.9.*
33
Pin-Priority: 1000
44

55
Package: erlang*
6-
Pin: version 1:23.*
6+
Pin: version 1:25.*
77
Pin-Priority: 1000
88

99
# NOTE(mgoddard): logstash 7.9.x is the last version that supports

‎docker/base/erlang-solutions.repo‎

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

‎docker/base/hrw-copr-erlang-for-rabbitmq.repo‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# NOTE(hrw): this repository contains rebuild of Erlang package from RabbitMQ team
2+
# from https://github.com/rabbitmq/erlang-rpm/
3+
# Thanks to COPR we have aarch64 packages for CentOS Stream 8/9
4+
5+
[copr-hrw-erlang-for-rabbitmq]
6+
name=Hrw's COPR with Erlang build for RabbitMQ
7+
baseurl=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/centos-stream-$releasever-$basearch/
8+
gpgcheck=1
9+
enabled=0
10+
gpgkey=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/pubkey.gpg
11+
repo_gpgcheck=0

‎docker/kolla-toolbox/Dockerfile.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2424

2525
{% set kolla_toolbox_packages = [
2626
'crudini',
27-
'erlang-23.*',
27+
'erlang-25.*',
2828
'gcc',
2929
'gdisk',
3030
'git',
@@ -39,7 +39,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
3939
'openssl-devel',
4040
'openvswitch',
4141
'python3-devel',
42-
'rabbitmq-server-3.8.*'
42+
'rabbitmq-server-3.9.*'
4343
] %}
4444

4545
{% elif base_package_type == 'deb' %}

‎docker/rabbitmq/Dockerfile.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2020
{% if base_package_type == 'rpm' %}
2121

2222
{% set rabbitmq_packages = [
23-
'erlang-23.*',
23+
'erlang-25.*',
2424
'hostname',
25-
'rabbitmq-server-3.8.*'
25+
'rabbitmq-server-3.9.*'
2626
] %}
2727

2828
{% elif base_package_type == 'deb' %}

‎kolla/template/repos.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ centos-aarch64:
2424
elasticsearch: "elasticsearch-kibana-logstash-7.x"
2525
epel: "epel"
2626
epel-modular: "epel-modular"
27-
erlang: "erlang-solutions"
27+
erlang: "copr-hrw-erlang-for-rabbitmq"
2828
extras: "extras"
2929
grafana: "grafana"
3030
hacluster: "ha"
@@ -59,7 +59,7 @@ rhel:
5959

6060
debian:
6161
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
62-
erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian bullseye main"
62+
erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
6363
grafana: "deb https://packages.grafana.com/oss/deb stable main"
6464
influxdb: "deb https://repos.influxdata.com/debian bullseye stable"
6565
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
@@ -70,7 +70,7 @@ debian:
7070

7171
debian-aarch64:
7272
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
73-
erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian bullseye main"
73+
erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
7474
grafana: "deb https://packages.grafana.com/oss/deb stable main"
7575
influxdb: "deb https://repos.influxdata.com/debian bullseye stable"
7676
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
@@ -81,7 +81,7 @@ debian-aarch64:
8181

8282
ubuntu:
8383
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
84-
erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main"
84+
erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
8585
grafana: "deb https://packages.grafana.com/oss/deb stable main"
8686
influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
8787
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
@@ -93,7 +93,7 @@ ubuntu:
9393

9494
ubuntu-aarch64:
9595
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
96-
erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main"
96+
erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
9797
grafana: "deb https://packages.grafana.com/oss/deb stable main"
9898
influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
9999
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"

0 commit comments

Comments
 (0)