Skip to content

Bump secondary umbrella to 4.0, re-enable Khepri mixed versions #12393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Bump secondary umbrella to 4.0, re-enable Khepri mixed versions #12393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51cf642
Use 4.0.2 as secondary umbrella
the-mikedavis Sep 26, 2024
324288a
Re-enable Khepri mixed versions testing
the-mikedavis Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/test-plugin-mixed.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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