From 51cf642d10b504a260e771d3291e95d96632cc2f Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 26 Sep 2024 13:01:00 -0400
Subject: [PATCH 1/2] Use 4.0.2 as 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 e6db1085ed2d..c231fed571e0 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -428,7 +428,7 @@ secondary_umbrella = use_extension(
 
 use_repo(
     secondary_umbrella,
-    "rabbitmq-server-generic-unix-3.13",
+    "rabbitmq-server-generic-unix-4.0",
 )
 
 hex = use_extension(
diff --git a/bazel/bzlmod/secondary_umbrella.bzl b/bazel/bzlmod/secondary_umbrella.bzl
index 613961d5a616..7c8b9b9cb7b0 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.13",
+        name = "rabbitmq-server-generic-unix-4.0",
         build_file = "@//:BUILD.package_generic_unix",
         patch_cmds = [ADD_PLUGINS_DIR_BUILD_FILE],
-        strip_prefix = "rabbitmq_server-3.13.7",
+        strip_prefix = "rabbitmq_server-4.0.0",
         # 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/26.1/package-generic-unix-for-mixed-version-testing-v3.13.7.tar.xz",
+            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/26.1/package-generic-unix-for-mixed-version-testing-v4.0.2.tar.xz",
         ],
     )
diff --git a/rabbitmq.bzl b/rabbitmq.bzl
index d0a5b52405fc..c338031934d6 100644
--- a/rabbitmq.bzl
+++ b/rabbitmq.bzl
@@ -290,12 +290,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.13//:rabbitmq-run)",
+            "RABBITMQ_RUN_SECONDARY": "$(location @rabbitmq-server-generic-unix-4.0//:rabbitmq-run)",
             "LANG": "C.UTF-8",
         }.items() + test_env.items()),
         tools = [
             ":rabbitmq-for-tests-run",
-            "@rabbitmq-server-generic-unix-3.13//:rabbitmq-run",
+            "@rabbitmq-server-generic-unix-4.0//:rabbitmq-run",
         ] + tools,
         deps = assumed_deps + deps + runtime_deps,
         ct_run_extra_args = ["-kernel net_ticktime 5"],

From 324288ad6de44881f1c6a2a03ac714ed99370072 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 26 Sep 2024 13:02:16 -0400
Subject: [PATCH 2/2] Re-enable Khepri mixed versions testing

---
 .github/workflows/test-plugin-mixed.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/test-plugin-mixed.yaml b/.github/workflows/test-plugin-mixed.yaml
index 6bcda182cf16..7d3b1dba6286 100644
--- a/.github/workflows/test-plugin-mixed.yaml
+++ b/.github/workflows/test-plugin-mixed.yaml
@@ -29,10 +29,7 @@ jobs:
         - 26
         metadata_store:
           - mnesia
-          # Khepri is currently skipped because Khepri is an unstable feature: we don't guarantee upgrability.
-          # Mixed-version tests currently fail with Khepri because of a new machine version introduced in
-          # Khepri v0.14.0.
-          # - khepri
+          - khepri
         include:
         - erlang_version: 26
           elixir_version: 1.15