From 5a6968b4298d785124ab4aa0c431765f184a8d99 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Fri, 3 Mar 2023 17:09:05 +0100
Subject: [PATCH] Update rabbitmq to 3.10.7

Usage of 3.10.7 rabbitmq does allow us to bump erlang to 25.0.4 which is
currnetly supported and present in repositories.

Change-Id: I598ec914f1bd6c5e39a779ef5453e6847f49d5a2
---
 .../notes/erlang-25-758e2cba9f9852c5.yaml     |  7 ++++
 vars/debian-11.yml                            | 42 -------------------
 vars/debian.yml                               |  4 +-
 vars/redhat.yml                               |  4 +-
 4 files changed, 11 insertions(+), 46 deletions(-)
 create mode 100644 releasenotes/notes/erlang-25-758e2cba9f9852c5.yaml
 delete mode 100644 vars/debian-11.yml

diff --git a/releasenotes/notes/erlang-25-758e2cba9f9852c5.yaml b/releasenotes/notes/erlang-25-758e2cba9f9852c5.yaml
new file mode 100644
index 00000000..091244dc
--- /dev/null
+++ b/releasenotes/notes/erlang-25-758e2cba9f9852c5.yaml
@@ -0,0 +1,7 @@
+---
+
+other:
+  - |
+    Erlang will is updated to version 25.0.4, RabbitMQ will be upgraded to version
+    3.10.7.
+    This will also harmonize RabbitMQ/Erlang versioning for Debian Bullseye.
diff --git a/vars/debian-11.yml b/vars/debian-11.yml
deleted file mode 100644
index 37b2b6e9..00000000
--- a/vars/debian-11.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-# Copyright 2021. BBC R&D
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-_rabbitmq_install_method: external_repo
-_rabbitmq_package_version: "3.10.2-1"
-
-_rabbitmq_erlang_install_method: distro
-_rabbitmq_erlang_version_spec: "23.2.6+dfsg-1"
-
-_rabbitmq_gpg_keys:
-  - file: gpg/C072C960 # RabbitMQ Cloudsmith repo
-  - file: gpg/0A9AF211 # RabbitMQ Release Signing Key
-
-# NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/
-
-_rabbitmq_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/{{ ansible_facts['distribution'] | lower }}"
-_rabbitmq_repo:
-  repo: "deb {{ rabbitmq_repo_url }} {{ ansible_facts['distribution_release'] | lower }} main"
-  state: "present"
-  filename: "RabbitMQ"
-
-rabbitmq_dependencies:
-  - erlang-base
-  - erlang-diameter
-  - erlang-eldap
-  - erlang-nox
-  - socat
-
-rabbitmq_distro_packages:
-  - rabbitmq-server
diff --git a/vars/debian.yml b/vars/debian.yml
index f41bc6c4..16ea58ba 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 _rabbitmq_install_method: external_repo
-_rabbitmq_package_version: "3.10.2-1"
+_rabbitmq_package_version: "3.10.7-1"
 
 _rabbitmq_gpg_keys:
   - file: gpg/C072C960 # RabbitMQ Cloudsmith repo
@@ -35,7 +35,7 @@ _rabbitmq_erlang_repo:
   state: "present"
   filename: els_erlang
 
-_rabbitmq_erlang_version_spec: "{{ (rabbitmq_install_method == 'external_repo') | ternary('1:24.3.4.7-1', '1:22.*') }}"
+_rabbitmq_erlang_version_spec: "{{ (rabbitmq_install_method == 'external_repo') | ternary('1:25.0.4-1', '1:22.*') }}"
 
 rabbitmq_dependencies:
   - erlang-base
diff --git a/vars/redhat.yml b/vars/redhat.yml
index b019b91e..0e8eae0b 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 _rabbitmq_install_method: external_repo
-_rabbitmq_package_version: 3.10.2-1
-_erlang_package_version: 24.3.4.7-1
+_rabbitmq_package_version: 3.10.7-1
+_erlang_package_version: 25.0.4-1
 
 # NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/