Build RabbitMQ 3.11, 3.12 and 3.13 in 2023.1

MoteHue · MoteHue · commit 343e0bc408d8 · 2024-07-12T09:15:41.000+01:00
An operator will need to upgrade to 3.12 before a SLURP upgrade to
Caracal, which has 3.13.

Also provide 3.13 if an operator wishes to use the latest supoorted
RabbitMQ release in 2023.1

Change-Id: Idadfad79eb566f2c45c5e36d4c25f4d23f2bbbd9
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/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-25', 'openvswitch', 'rabbitmq']) }}
 
 {% block rabbitmq_apt_preferences %}
 {% if base_package_type == 'deb' %}
diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.debian b/docker/kolla-toolbox/apt_preferences_rabbitmq.debian
@@ -1 +1 @@
-../rabbitmq/apt_preferences_rabbitmq.debian
+../rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian
diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu b/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu
@@ -1 +1 @@
-../rabbitmq/apt_preferences_rabbitmq.debian
+../rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu
diff --git a/docker/rabbitmq/rabbitmq-3-12/Dockerfile.j2 b/docker/rabbitmq/rabbitmq-3-12/Dockerfile.j2
@@ -0,0 +1 @@
+../rabbitmq/Dockerfile.j2
diff --git a/docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.debian b/docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.debian
@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 3.12.*
+Pin-Priority: 1000
+
+Package: erlang*
+Pin: version 1:26.*
+Pin-Priority: 1000
diff --git a/docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.ubuntu
@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 3.12.*
+Pin-Priority: 1000
+
+Package: erlang*
+Pin: version 1:26.*
+Pin-Priority: 1000
diff --git a/docker/rabbitmq/rabbitmq-3-12/extend_start.sh b/docker/rabbitmq/rabbitmq-3-12/extend_start.sh
@@ -0,0 +1 @@
+../rabbitmq/extend_start.sh
diff --git a/docker/rabbitmq/rabbitmq-3-12/healthcheck_rabbitmq b/docker/rabbitmq/rabbitmq-3-12/healthcheck_rabbitmq
@@ -0,0 +1 @@
+../rabbitmq/healthcheck_rabbitmq
diff --git a/docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.centos b/docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.centos
@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-26.*',
+    'rabbitmq-server-3.12.*'
+] %}
diff --git a/docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.rocky b/docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.rocky
@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-26.*',
+    'rabbitmq-server-3.12.*'
+] %}
diff --git a/docker/rabbitmq/rabbitmq-3-13/Dockerfile.j2 b/docker/rabbitmq/rabbitmq-3-13/Dockerfile.j2
@@ -0,0 +1 @@
+../rabbitmq/Dockerfile.j2
diff --git a/docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.debian b/docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.debian
@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 3.13.*
+Pin-Priority: 1000
+
+Package: erlang*
+Pin: version 1:26.2.*
+Pin-Priority: 1000
diff --git a/docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.ubuntu
@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 3.13.*
+Pin-Priority: 1000
+
+Package: erlang*
+Pin: version 1:26.2.*
+Pin-Priority: 1000
diff --git a/docker/rabbitmq/rabbitmq-3-13/extend_start.sh b/docker/rabbitmq/rabbitmq-3-13/extend_start.sh
@@ -0,0 +1 @@
+../rabbitmq/extend_start.sh
diff --git a/docker/rabbitmq/rabbitmq-3-13/healthcheck_rabbitmq b/docker/rabbitmq/rabbitmq-3-13/healthcheck_rabbitmq
@@ -0,0 +1 @@
+../rabbitmq/healthcheck_rabbitmq
diff --git a/docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.centos b/docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.centos
@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-26.2.*',
+    'rabbitmq-server-3.13.*'
+] %}
diff --git a/docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.rocky b/docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.rocky
@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-26.2.*',
+    'rabbitmq-server-3.13.*'
+] %}
diff --git a/docker/rabbitmq/rabbitmq/Dockerfile.j2 b/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-25', 'erlang-26', '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-25.*',
-        'rabbitmq-server-3.11.*'
-    ] %}
+    {% set filepath = "rabbitmq/" + image_name + "/rabbitmq_packages_rpm." + base_distro %}
+    {% from filepath import rabbitmq_packages %}
 
 {% elif base_package_type == 'deb' %}
     {% set rabbitmq_packages = [
diff --git a/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian b/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian
@@ -2,6 +2,6 @@ Package: rabbitmq-server
 Pin: version 3.11.*
 Pin-Priority: 1000
 
-Package: erlang
-Pin: version 25.*
+Package: erlang*
+Pin: version 1:25.*
 Pin-Priority: 1000
diff --git a/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu
@@ -2,6 +2,6 @@ Package: rabbitmq-server
 Pin: version 3.11.*
 Pin-Priority: 1000
 
-Package: erlang
-Pin: version 25.*
+Package: erlang*
+Pin: version 1:25.*
 Pin-Priority: 1000
diff --git a/docker/rabbitmq/rabbitmq/extend_start.sh b/docker/rabbitmq/rabbitmq/extend_start.sh
diff --git a/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq b/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq
diff --git a/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.centos b/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.centos
@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-25.*',
+    'rabbitmq-server-3.11.*'
+] %}
diff --git a/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.rocky b/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.rocky
@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-25.*',
+    'rabbitmq-server-3.11.*'
+] %}
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
@@ -36,11 +36,16 @@ centos-aarch64:
   td-agent: "treasuredata"
 
 debian:
-  erlang:
+  erlang-25:
     url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    suite: "focal"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
   grafana:
     url: "https://apt.grafana.com"
     suite: "stable"
@@ -83,11 +88,16 @@ debian:
     gpg_key: "treasuredata.asc"
 
 debian-aarch64:
-  erlang:
+  erlang-25:
     url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    suite: "focal"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
   grafana:
     url: "https://apt.grafana.com"
     suite: "stable"
@@ -167,11 +177,16 @@ rocky-aarch64:
   td-agent: "treasuredata"
 
 ubuntu:
-  erlang:
+  erlang-25:
     url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
   grafana:
     url: "https://apt.grafana.com"
     suite: "stable"
@@ -214,11 +229,16 @@ ubuntu:
     gpg_key: "treasuredata.asc"
 
 ubuntu-aarch64:
-  erlang:
+  erlang-25:
     url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
   grafana:
     url: "https://apt.grafana.com"
     suite: "stable"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../rabbitmq/apt_preferences_rabbitmq.debian`
	`1`	`+../rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian`