From 8f9e962d47ef86025122ffc7254274d28f4bc140 Mon Sep 17 00:00:00 2001
From: Bartosz Bezak <bartosz@stackhpc.com>
Date: Mon, 30 Sep 2024 10:33:37 +0200
Subject: [PATCH] Fix rabbitmq builds after move to Cloudsmith mirror (#1301)
 (#1304)

* Add sed for multiline baseurl in yum repos

* use new Rabbitmq Cloudsmith repos

* use rabbitmq built from Cloudsmith repo
---
 etc/kayobe/kolla-image-tags.yml                            | 2 ++
 etc/kayobe/kolla.yml                                       | 1 +
 etc/kayobe/pulp-repo-versions.yml                          | 4 ++--
 etc/kayobe/stackhpc.yml                                    | 2 +-
 .../notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml  | 7 +++++++
 5 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 47701afea..8f85eef15 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -26,3 +26,5 @@ kolla_image_tags:
   prometheus:
     rocky-9: 2024.1-rocky-9-20240910T072617
     ubuntu-jammy: 2024.1-ubuntu-jammy-20240910T072617
+  rabbitmq:
+    rocky-9: 2024.1-rocky-9-20240927T152945
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index f17e08f0f..1e551b814 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -284,6 +284,7 @@ kolla_build_blocks:
     {% for repo in base_centos_repo_overrides_post_yum_list %}
         sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \
+               -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[ \t]*\(https.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
     {% endfor %}
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 6867b40ee..054c6ba95 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -11,8 +11,8 @@ stackhpc_pulp_repo_epel_9_version: 20240902T080424
 stackhpc_pulp_repo_grafana_version: 20240902T080424
 stackhpc_pulp_repo_opensearch_2_x_version: 20240807T235120
 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240807T235120
-stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20240711T091318
-stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20240829T093746
+stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20240925T093206
+stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20240925T111913
 stackhpc_pulp_repo_rhel_9_influxdb_version: 20240817T001913
 stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20240810T001640
 stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index c8ce513d5..8526eb7cd 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -61,7 +61,7 @@ stackhpc_repo_rhel9_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/co
 stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
 
 # RabbitMQ for RHEL 9
-stackhpc_repo_rhel9_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/x86_64/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
+stackhpc_repo_rhel9_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
 stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
 
 # CentOS Stream 9 - NFV OpenvSwitch
diff --git a/releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml b/releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml
new file mode 100644
index 000000000..b1a66e16f
--- /dev/null
+++ b/releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    RabbitMQ and Erlang packages are now all installed from the Cloudsmith
+    ``rabbitmq.com`` mirrors since the RabbitMQ ``packagecloud.io`` is getting
+    shut down August 18st, 2024:
+    https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024