From c6672b9dea646b8dc1e4f71cec8a1191ba971c97 Mon Sep 17 00:00:00 2001
From: Rin Kuryloski <kuryloskip@vmware.com>
Date: Thu, 25 May 2023 15:47:20 +0200
Subject: [PATCH] Use the latest 3.12.x for the secondary umbrella

---
 MODULE.bazel                        | 2 +-
 bazel/bzlmod/secondary_umbrella.bzl | 6 +++---
 rabbitmq.bzl                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index c3ca3dddaf..362cb630ec 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -487,7 +487,7 @@ secondary_umbrella = use_extension(
 
 use_repo(
     secondary_umbrella,
-    "rabbitmq-server-generic-unix-3.11",
+    "rabbitmq-server-generic-unix-3.12",
 )
 
 hex = use_extension(
diff --git a/bazel/bzlmod/secondary_umbrella.bzl b/bazel/bzlmod/secondary_umbrella.bzl
index 2ca4b36626..aa777afb52 100644
--- a/bazel/bzlmod/secondary_umbrella.bzl
+++ b/bazel/bzlmod/secondary_umbrella.bzl
@@ -25,12 +25,12 @@ EOF
 
 def secondary_umbrella():
     http_archive(
-        name = "rabbitmq-server-generic-unix-3.11",
+        name = "rabbitmq-server-generic-unix-3.12",
         build_file = "@//:BUILD.package_generic_unix",
         patch_cmds = [ADD_PLUGINS_DIR_BUILD_FILE],
-        strip_prefix = "rabbitmq_server-3.11.18",
+        strip_prefix = "rabbitmq_server-3.12.3",
         # This file is produced just in time by the test-mixed-versions.yaml GitHub Actions workflow.
         urls = [
-            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_3/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz",
+            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_3/package-generic-unix-for-mixed-version-testing-v3.12.3.tar.xz",
         ],
     )
diff --git a/rabbitmq.bzl b/rabbitmq.bzl
index 807ed33b7b..8ac7048db8 100644
--- a/rabbitmq.bzl
+++ b/rabbitmq.bzl
@@ -283,12 +283,12 @@ def rabbitmq_integration_suite(
             "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmqctl".format(package),
             "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-plugins".format(package),
             "RABBITMQ_QUEUES": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-queues".format(package),
-            "RABBITMQ_RUN_SECONDARY": "$(location @rabbitmq-server-generic-unix-3.11//:rabbitmq-run)",
+            "RABBITMQ_RUN_SECONDARY": "$(location @rabbitmq-server-generic-unix-3.12//:rabbitmq-run)",
             "LANG": "C.UTF-8",
         }.items() + test_env.items()),
         tools = [
             ":rabbitmq-for-tests-run",
-            "@rabbitmq-server-generic-unix-3.11//:rabbitmq-run",
+            "@rabbitmq-server-generic-unix-3.12//:rabbitmq-run",
         ] + tools,
         deps = assumed_deps + deps + runtime_deps,
         **kwargs