Merge "Build RabbitMQ 4.1 in stable releases" into stable/2024.2

docker/kolla-toolbox/Dockerfile.j2

@@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='ansible') }}
 {{ macros.configure_user(name='rabbitmq') }}
 
-{{ macros.enable_extra_repos(['crb', 'erlang', 'openvswitch', 'rabbitmq']) }}
+{{ macros.enable_extra_repos(['crb', 'erlang', 'erlang-26', 'openvswitch', 'rabbitmq']) }}
 
 {% block rabbitmq_apt_preferences %}
 {% if base_package_type == 'deb' %}

docker/kolla-toolbox/apt_preferences_rabbitmq.debian

@@ -1 +1 @@
-../rabbitmq/apt_preferences_rabbitmq.debian
+../rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian

docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu

@@ -1 +1 @@
-../rabbitmq/apt_preferences_rabbitmq.debian
+../rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu

docker/rabbitmq/rabbitmq-4-1/Dockerfile.j2

@@ -0,0 +1 @@
+../rabbitmq/Dockerfile.j2

docker/rabbitmq/rabbitmq-4-1/apt_preferences_rabbitmq.debian

@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 4.1.*
+Pin-Priority: 1000
+
+Package: erlang*
+Pin: version 1:27.*
+Pin-Priority: 1000

docker/rabbitmq/rabbitmq-4-1/apt_preferences_rabbitmq.ubuntu

@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 4.1.*
+Pin-Priority: 1000
+
+Package: erlang*
+Pin: version 1:27.*
+Pin-Priority: 1000

docker/rabbitmq/rabbitmq-4-1/extend_start.sh

@@ -0,0 +1 @@
+../rabbitmq/extend_start.sh

docker/rabbitmq/rabbitmq-4-1/healthcheck_rabbitmq

@@ -0,0 +1 @@
+../rabbitmq/healthcheck_rabbitmq

docker/rabbitmq/rabbitmq-4-1/rabbitmq_packages_rpm.centos

@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-27.*',
+    'rabbitmq-server-4.1.*'
+] %}

docker/rabbitmq/rabbitmq-4-1/rabbitmq_packages_rpm.rocky

@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-27.*',
+    'rabbitmq-server-4.1.*'
+] %}

docker/rabbitmq/rabbitmq/Dockerfile.j2

@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='rabbitmq') }}
 
-{{ macros.enable_extra_repos(['crb', 'erlang', 'rabbitmq']) }}
+{{ macros.enable_extra_repos(['crb', 'erlang', 'erlang-26', 'erlang-27', 'rabbitmq']) }}
 
 {% block rabbitmq_apt_preferences %}
 {% if base_package_type == 'deb' %}
@@ -20,10 +20,8 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
 {% block rabbitmq_install %}
 {% if base_package_type == 'rpm' %}
 
-    {% set rabbitmq_packages = [
-        'erlang-26.2.*',
-        'rabbitmq-server-3.13.*'
-    ] %}
+    {% set filepath = "rabbitmq/" + image_name + "/rabbitmq_packages_rpm." + base_distro %}
+    {% from filepath import rabbitmq_packages %}
 
 {% elif base_package_type == 'deb' %}
     {% set rabbitmq_packages = [

docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian

@@ -2,6 +2,6 @@ Package: rabbitmq-server
 Pin: version 3.13.*
 Pin-Priority: 1000
 
-Package: erlang
-Pin: version 26.2.*
+Package: erlang*
+Pin: version 1:26.2.*
 Pin-Priority: 1000

docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu

@@ -2,6 +2,6 @@ Package: rabbitmq-server
 Pin: version 3.13.*
 Pin-Priority: 1000
 
-Package: erlang
-Pin: version 26.2.*
+Package: erlang*
+Pin: version 1:26.2.*
 Pin-Priority: 1000

docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.centos

@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-26.2.*',
+    'rabbitmq-server-3.13.*'
+] %}

docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.rocky

@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-26.2.*',
+    'rabbitmq-server-3.13.*'
+] %}

kolla/template/repos.yaml

@@ -39,8 +39,13 @@ centos-aarch64:
 # https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
 
 debian:
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-26/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
+  erlang-27:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-27/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
@@ -86,8 +91,13 @@ debian:
     gpg_key: "rabbitmq.gpg"
 
 debian-aarch64:
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-26/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
+  erlang-27:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-27/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
@@ -172,9 +182,14 @@ rocky-aarch64:
   rabbitmq: "rabbitmq_rabbitmq-server"
 
 ubuntu:
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
-    suite: "noble"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-26/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
+  erlang-27:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-27/ubuntu"
+    suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
   fluentd:
@@ -220,9 +235,14 @@ ubuntu:
     gpg_key: "rabbitmq.gpg"
 
 ubuntu-aarch64:
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
-    suite: "noble"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-26/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
+  erlang-27:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-27/ubuntu"
+    suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
   fluentd: