Merge "rabbitmq: bump version to 3.12"

7 files changed, 10 insertions, 11 deletions

diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index fb93b2128..21e99839e 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -1,5 +1,5 @@
 Package: rabbitmq-server
-Pin: version 3.11.*
+Pin: version 3.12.*
 Pin-Priority: 1000
 
 # NOTE(hrw): we do not want backports unless requested
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
index a9e30b7ca..9c6eae9b1 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/docker/base/apt_preferences.ubuntu
@@ -1,5 +1,5 @@
 Package: rabbitmq-server
-Pin: version 3.11.*
+Pin: version 3.12.*
 Pin-Priority: 1000
 
 Package: *
diff --git a/docker/base/hrw-copr-erlang-for-rabbitmq.repo b/docker/base/hrw-copr-erlang-for-rabbitmq.repo
index 9c4e20bd6..d06e11464 100644
--- a/docker/base/hrw-copr-erlang-for-rabbitmq.repo
+++ b/docker/base/hrw-copr-erlang-for-rabbitmq.repo
@@ -4,8 +4,8 @@
 
 [copr-hrw-erlang-for-rabbitmq]
 name=Hrw's COPR with Erlang build for RabbitMQ
-baseurl=https://download.copr.fedorainfracloud.org/results/hrw/erlang-25-for-rabbitmq/centos-stream-$releasever-$basearch/
+baseurl=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/centos-stream-$releasever-$basearch/
 gpgcheck=1
 enabled=0
-gpgkey=https://download.copr.fedorainfracloud.org/results/hrw/erlang-25-for-rabbitmq/pubkey.gpg
+gpgkey=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/pubkey.gpg
 repo_gpgcheck=0
diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo
index a5f5d217b..0c9681bc6 100644
--- a/docker/base/rabbitmq_rabbitmq-erlang.repo
+++ b/docker/base/rabbitmq_rabbitmq-erlang.repo
@@ -1,7 +1,6 @@
 [rabbitmq_rabbitmq-erlang]
 name=rabbitmq_rabbitmq-erlang
-# https://www.rabbitmq.com/install-rpm.html lists "el/8" for CentOS Stream 9
-baseurl=https://packagecloud.io/rabbitmq/erlang/el/8/$basearch
+baseurl=https://packagecloud.io/rabbitmq/erlang/el/9/$basearch
 gpgcheck=1
 enabled=0
 gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo
index a243f9d78..d08af4c54 100644
--- a/docker/base/rabbitmq_rabbitmq-server.repo
+++ b/docker/base/rabbitmq_rabbitmq-server.repo
@@ -1,6 +1,6 @@
 [rabbitmq_rabbitmq-server]
 name=rabbitmq_rabbitmq-server
-baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/8/$basearch
+baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/9/$basearch
 gpgcheck=1
 enabled=0
 gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index def4792fc..5dadf0797 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
     {% set kolla_toolbox_packages = [
         'crudini',
-        'erlang-25.*',
+        'erlang-26.*',
         'gcc',
         'gdisk',
         'git',
@@ -32,7 +32,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'openssl-devel',
         'openvswitch',
         'python3-devel',
-        'rabbitmq-server-3.11.*'
+        'rabbitmq-server-3.12.*'
     ] %}
 
 {% elif base_package_type == 'deb' %}
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index c17cf0a19..e6dacba04 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -15,8 +15,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if base_package_type == 'rpm' %}
 
     {% set rabbitmq_packages = [
-        'erlang-25.*',
-        'rabbitmq-server-3.11.*'
+        'erlang-26.*',
+        'rabbitmq-server-3.12.*'
     ] %}
 
 {% elif base_package_type == 'deb' %}