From 54d9dda96e49ef6deebc464aece1ad13531dd64b Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Tue, 25 Apr 2023 20:49:58 +0200 Subject: [PATCH 1/2] Simplify the reference to RABBITMQ_RUN in bazel in integration tests (cherry picked from commit 3e83c9755ae46b102170669cc872a2435b9c96dc) (cherry picked from commit 330aa8acab174030bdca412849efaf2b5549bebb) # Conflicts: # rabbitmq.bzl --- rabbitmq.bzl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/rabbitmq.bzl b/rabbitmq.bzl index 541f9123800..e01073c41bc 100644 --- a/rabbitmq.bzl +++ b/rabbitmq.bzl @@ -241,7 +241,7 @@ def rabbitmq_integration_suite( test_env = dict({ "SKIP_MAKE_TEST_DIST": "true", "RABBITMQ_CT_SKIP_AS_ERROR": "true", - "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/rabbitmq-for-tests-run".format(package), + "RABBITMQ_RUN": "$(location :rabbitmq-for-tests-run)", "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), @@ -262,6 +262,7 @@ def rabbitmq_integration_suite( data = native.glob(["test/{}_data/**/*".format(name)]) + data, test_env = dict({ "SKIP_MAKE_TEST_DIST": "true", +<<<<<<< HEAD # The feature flags listed below are required. This means they must # be enabled in mixed-version testing before even starting cluster # because newer node don't have the corresponding @@ -275,6 +276,19 @@ def rabbitmq_integration_suite( # user_limits "RABBITMQ_FEATURE_FLAGS": "quorum_queue,implicit_default_bindings,virtual_host_metadata,maintenance_mode_status,user_limits", "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/rabbitmq-for-tests-run".format(package), +======= + # The feature flags listed below are required. This means they must be enabled in mixed-version testing + # before even starting the cluster because newer nodes don't have the corresponding compatibility/migration code. + "RABBITMQ_FEATURE_FLAGS": + # required starting from 3.11.0 in rabbit: + "quorum_queue,implicit_default_bindings,virtual_host_metadata,maintenance_mode_status,user_limits," + + # required starting from 3.12.0 in rabbit: + "feature_flags_v2,stream_queue,classic_queue_type_delivery_support,classic_mirrored_queue_version," + + "stream_single_active_consumer,direct_exchange_routing_v2,listener_records_in_ets,tracking_records_in_ets", + # required starting from 3.12.0 in rabbitmq_management_agent: + # empty_basic_get_metric, drop_unroutable_metric + "RABBITMQ_RUN": "$(location :rabbitmq-for-tests-run)", +>>>>>>> 330aa8acab (Simplify the reference to RABBITMQ_RUN in bazel in integration tests) "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), From 6bf7ee69b10f153a242502351cab880ef56925be Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Wed, 26 Apr 2023 10:32:28 +0200 Subject: [PATCH 2/2] Fixup backport --- rabbitmq.bzl | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/rabbitmq.bzl b/rabbitmq.bzl index e01073c41bc..e5b87d815b5 100644 --- a/rabbitmq.bzl +++ b/rabbitmq.bzl @@ -262,7 +262,6 @@ def rabbitmq_integration_suite( data = native.glob(["test/{}_data/**/*".format(name)]) + data, test_env = dict({ "SKIP_MAKE_TEST_DIST": "true", -<<<<<<< HEAD # The feature flags listed below are required. This means they must # be enabled in mixed-version testing before even starting cluster # because newer node don't have the corresponding @@ -275,20 +274,7 @@ def rabbitmq_integration_suite( # maintenance_mode_status # user_limits "RABBITMQ_FEATURE_FLAGS": "quorum_queue,implicit_default_bindings,virtual_host_metadata,maintenance_mode_status,user_limits", - "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/rabbitmq-for-tests-run".format(package), -======= - # The feature flags listed below are required. This means they must be enabled in mixed-version testing - # before even starting the cluster because newer nodes don't have the corresponding compatibility/migration code. - "RABBITMQ_FEATURE_FLAGS": - # required starting from 3.11.0 in rabbit: - "quorum_queue,implicit_default_bindings,virtual_host_metadata,maintenance_mode_status,user_limits," + - # required starting from 3.12.0 in rabbit: - "feature_flags_v2,stream_queue,classic_queue_type_delivery_support,classic_mirrored_queue_version," + - "stream_single_active_consumer,direct_exchange_routing_v2,listener_records_in_ets,tracking_records_in_ets", - # required starting from 3.12.0 in rabbitmq_management_agent: - # empty_basic_get_metric, drop_unroutable_metric "RABBITMQ_RUN": "$(location :rabbitmq-for-tests-run)", ->>>>>>> 330aa8acab (Simplify the reference to RABBITMQ_RUN in bazel in integration tests) "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),