Skip to content

Commit

Permalink
Merge pull request #12393 from rabbitmq/md/khepri/secondary-4-0-2
Browse files Browse the repository at this point in the history
Bump secondary umbrella to 4.0, re-enable Khepri mixed versions
  • Loading branch information
michaelklishin authored Sep 27, 2024
2 parents 7888799 + 324288a commit dd3181d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/test-plugin-mixed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions bazel/bzlmod/secondary_umbrella.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
4 changes: 2 additions & 2 deletions rabbitmq.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down

0 comments on commit dd3181d

Please sign in to comment.