diff options
author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-05-10 17:38:03 +0200 |
---|---|---|
committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-05-10 17:55:27 +0200 |
commit | 13793e039bb37e969db35fc1821cdb07b1342b4c (patch) | |
tree | 2083c2e8d33be49d8f2694b6b0858031b3a261f1 | |
parent | 9c8a5907380df9e666c7e8cb1b0124cea21588a2 (diff) | |
download | rabbitmq-server-git-13793e039bb37e969db35fc1821cdb07b1342b4c.tar.gz |
Bazel file refactoring for rabbit
Also `bazel run broker` now includes all plugins to better match
`make run-broker`
-rw-r--r-- | BUILD.bazel | 75 | ||||
-rw-r--r-- | deps/rabbit/BUILD.bazel | 375 | ||||
-rw-r--r-- | rabbitmq.bzl | 19 |
3 files changed, 318 insertions, 151 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index cf873da9f9..816bc85b21 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -2,7 +2,6 @@ load("elixir_home.bzl", "elixir_home") load(":rabbitmq_home.bzl", "rabbitmq_home") load(":rabbitmq_run.bzl", "rabbitmq_run", "rabbitmq_run_command") load(":rabbitmqctl.bzl", "rabbitmqctl") -load(":rabbitmq.bzl", "management_plugins", "required_plugins") exports_files([ "scripts/bazel/rabbitmq-run.sh", @@ -32,28 +31,49 @@ platform( rabbitmq_home( name = "broker-home", - plugins = required_plugins(rabbitmq_workspace = "@"), -) - -rabbitmq_home( - name = "broker-management-home", - plugins = required_plugins(rabbitmq_workspace = "@") + management_plugins(rabbitmq_workspace = "@"), -) - -rabbitmq_home( - name = "broker-for-tests-home", - testonly = True, plugins = [ - "//deps/rabbit:test_bazel_erlang_lib", # <- compiled with test erlc_opts - "@rabbitmq_ct_client_helpers//:bazel_erlang_lib", - "@inet_tcp_proxy//:bazel_erlang_lib", - "@meck//:bazel_erlang_lib", + "//deps/rabbit:bazel_erlang_lib", + "//deps/rabbitmq_amqp1_0:bazel_erlang_lib", + "//deps/rabbitmq_auth_backend_cache:bazel_erlang_lib", + "//deps/rabbitmq_auth_backend_http:bazel_erlang_lib", + "//deps/rabbitmq_auth_backend_ldap:bazel_erlang_lib", + "//deps/rabbitmq_auth_backend_oauth2:bazel_erlang_lib", + "//deps/rabbitmq_auth_mechanism_ssl:bazel_erlang_lib", + "//deps/rabbitmq_consistent_hash_exchange:bazel_erlang_lib", + "//deps/rabbitmq_event_exchange:bazel_erlang_lib", + "//deps/rabbitmq_federation:bazel_erlang_lib", + "//deps/rabbitmq_federation_management:bazel_erlang_lib", + "//deps/rabbitmq_jms_topic_exchange:bazel_erlang_lib", + "//deps/rabbitmq_management:bazel_erlang_lib", + "//deps/rabbitmq_mqtt:bazel_erlang_lib", + "//deps/rabbitmq_peer_discovery_aws:bazel_erlang_lib", + "//deps/rabbitmq_peer_discovery_consul:bazel_erlang_lib", + "//deps/rabbitmq_peer_discovery_etcd:bazel_erlang_lib", + "//deps/rabbitmq_peer_discovery_k8s:bazel_erlang_lib", + "//deps/rabbitmq_prometheus:bazel_erlang_lib", + "//deps/rabbitmq_random_exchange:bazel_erlang_lib", + "//deps/rabbitmq_recent_history_exchange:bazel_erlang_lib", + "//deps/rabbitmq_sharding:bazel_erlang_lib", + "//deps/rabbitmq_shovel:bazel_erlang_lib", + "//deps/rabbitmq_shovel_management:bazel_erlang_lib", + "//deps/rabbitmq_stomp:bazel_erlang_lib", + "//deps/rabbitmq_stream:bazel_erlang_lib", + "//deps/rabbitmq_stream_management:bazel_erlang_lib", + "//deps/rabbitmq_stream_prometheus:bazel_erlang_lib", + "//deps/rabbitmq_top:bazel_erlang_lib", + "//deps/rabbitmq_tracing:bazel_erlang_lib", + "//deps/rabbitmq_trust_store:bazel_erlang_lib", + "//deps/rabbitmq_web_dispatch:bazel_erlang_lib", + "//deps/rabbitmq_web_mqtt:bazel_erlang_lib", + "//deps/rabbitmq_web_stomp:bazel_erlang_lib", ], ) rabbitmq_home( name = "broker-for-cli-tests-home", - plugins = required_plugins(rabbitmq_workspace = "@") + [ + testonly = True, + plugins = [ + "//deps/rabbit:bazel_erlang_lib", "//deps/rabbitmq_federation:bazel_erlang_lib", "//deps/rabbitmq_stomp:bazel_erlang_lib", "//deps/amqp_client:bazel_erlang_lib", @@ -67,19 +87,6 @@ rabbitmq_run( ) rabbitmq_run( - name = "rabbitmq-management-run", - home = ":broker-management-home", - visibility = ["//visibility:public"], -) - -rabbitmq_run( - name = "rabbitmq-for-tests-run", - testonly = True, - home = ":broker-for-tests-home", - visibility = ["//visibility:public"], -) - -rabbitmq_run( name = "rabbitmq-for-cli-tests-run", testonly = True, home = ":broker-for-cli-tests-home", @@ -95,14 +102,6 @@ rabbitmq_run_command( subcommand = "run-broker", ) -# `bazel run broker-management` for the broker with just the -# management plugin -rabbitmq_run_command( - name = "broker-management", - rabbitmq_run = ":rabbitmq-management-run", - subcommand = "run-broker", -) - # `bazel run rabbitmqctl` rabbitmqctl( name = "rabbitmqctl", diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel index d96af04c70..499ed6d8a0 100644 --- a/deps/rabbit/BUILD.bazel +++ b/deps/rabbit/BUILD.bazel @@ -1,5 +1,7 @@ load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc") load("@bazel-erlang//:ct.bzl", "ct_suite") +load("//:rabbitmq_home.bzl", "rabbitmq_home") +load("//:rabbitmq_run.bzl", "rabbitmq_run") load( "//:rabbitmq.bzl", "APP_VERSION", @@ -205,8 +207,26 @@ rabbitmq_lib( deps = DEPS, ) +rabbitmq_home( + name = "broker-for-tests-home", + testonly = True, + plugins = [ + ":test_bazel_erlang_lib", + "@rabbitmq_ct_client_helpers//:bazel_erlang_lib", + "@inet_tcp_proxy//:bazel_erlang_lib", + "@meck//:bazel_erlang_lib", + ], +) + +rabbitmq_run( + name = "rabbitmq-for-tests-run", + testonly = True, + home = ":broker-for-tests-home", +) + erlc( name = "quorum_queue_utils", + testonly = True, srcs = [ "test/quorum_queue_utils.erl", ], @@ -215,6 +235,7 @@ erlc( erlc( name = "rabbit_ha_test_consumer", + testonly = True, srcs = [ "test/rabbit_ha_test_consumer.erl", ], @@ -227,6 +248,7 @@ erlc( erlc( name = "rabbit_ha_test_producer", + testonly = True, srcs = [ "test/rabbit_ha_test_producer.erl", ], @@ -243,130 +265,146 @@ ct_suite( test_env = { "RABBITMQ_CT_SKIP_AS_ERROR": "true", }, - deps = DEPS, ) -ct_suite( +PACKAGE = "deps/rabbit" + +rabbitmq_integration_suite( + PACKAGE, name = "backing_queue_SUITE", size = "large", - data = [ - "@rabbitmq_ct_helpers//tools/tls-certs:Makefile", - "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in", - ], - erlc_opts = RABBITMQ_TEST_ERLC_OPTS, - test_env = { - "RABBITMQ_CT_SKIP_AS_ERROR": "true", - "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/rabbitmq-for-tests-run", - "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/broker-for-tests-home/sbin/rabbitmqctl", - "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/broker-for-tests-home/sbin/rabbitmq-plugins", - }, - tools = [ - "//:rabbitmq-for-tests-run", - ], - runtime_deps = [ - "//deps/rabbitmq_cli:elixir_as_bazel_erlang_lib", - "//deps/rabbitmq_cli:rabbitmqctl", - "@rabbitmq_ct_client_helpers//:bazel_erlang_lib", - "@rabbitmq_ct_helpers//:bazel_erlang_lib", - ], - deps = DEPS + [ - "//deps/amqp_client:bazel_erlang_lib", + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", ], ) rabbitmq_integration_suite( + PACKAGE, name = "channel_interceptor_SUITE", size = "medium", additional_srcs = [ "test/dummy_interceptor.erl", "test/failing_dummy_interceptor.erl", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "channel_operation_timeout_SUITE", size = "medium", additional_srcs = [ "test/channel_operation_timeout_test_queue.erl", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "cluster_rename_SUITE", size = "medium", groups = [ "cluster_size_2", "cluster_size_3", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "cluster_SUITE", size = "small", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "clustering_management_SUITE", size = "large", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "config_schema_SUITE", size = "medium", data = [ "test/definition_import_SUITE_data/case1.json", ], - deps = DEPS, ) rabbitmq_integration_suite( + PACKAGE, name = "confirms_rejects_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "consumer_timeout_SUITE", size = "medium", additional_beam = [ ":quorum_queue_utils", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "crashing_queues_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "dead_lettering_SUITE", size = "medium", additional_beam = [ ":quorum_queue_utils", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "definition_import_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "disconnect_detected_during_alarm_SUITE", size = "small", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "dynamic_ha_SUITE", size = "large", groups = { @@ -397,23 +435,27 @@ rabbitmq_integration_suite( "rebalance_multiple_blocked", ], }, - deps = DEPS + [ + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", "@proper//:bazel_erlang_lib", ], ) rabbitmq_integration_suite( + PACKAGE, name = "dynamic_qq_SUITE", size = "medium", additional_beam = [ ":quorum_queue_utils", ], - deps = DEPS + [ + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", "@proper//:bazel_erlang_lib", ], ) rabbitmq_integration_suite( + PACKAGE, name = "eager_sync_SUITE", size = "large", additional_beam = [ @@ -432,10 +474,13 @@ rabbitmq_integration_suite( ], }, tags = ["classic-queue"], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "feature_flags_SUITE", matrix = { "registry": { @@ -492,56 +537,75 @@ rabbitmq_integration_suite( "//deps/rabbit/apps/rabbitmq_prelaunch:test_bazel_erlang_lib", "//deps/rabbit/test/feature_flags_SUITE_data/my_plugin:bazel_erlang_lib", ], - deps = DEPS, ) rabbitmq_integration_suite( + PACKAGE, name = "lazy_queue_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "list_consumers_sanity_check_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "list_queues_online_and_offline_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "maintenance_mode_SUITE", size = "medium", additional_beam = [ ":quorum_queue_utils", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "many_node_ha_SUITE", size = "medium", additional_beam = [ ":rabbit_ha_test_consumer", ":rabbit_ha_test_producer", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "message_size_limit_SUITE", size = "small", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "metrics_SUITE", size = "medium", - deps = DEPS + [ + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", "@proper//:bazel_erlang_lib", ], ) @@ -574,6 +638,7 @@ ct_suite( ) rabbitmq_integration_suite( + PACKAGE, name = "peer_discovery_classic_config_SUITE", size = "medium", groups = { @@ -589,115 +654,166 @@ rabbitmq_integration_suite( "no_nodes_configured", ], }, - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "peer_discovery_dns_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "per_user_connection_channel_limit_partitions_SUITE", size = "large", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "per_user_connection_channel_limit_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "per_user_connection_channel_tracking_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "per_user_connection_tracking_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "per_vhost_connection_limit_partitions_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "per_vhost_connection_limit_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "per_vhost_msg_store_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "per_vhost_queue_limit_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "policy_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "priority_queue_recovery_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "priority_queue_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "product_info_SUITE", size = "medium", - deps = DEPS, ) rabbitmq_integration_suite( + PACKAGE, name = "proxy_protocol_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "publisher_confirms_parallel_SUITE", size = "medium", additional_beam = [ ":quorum_queue_utils", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "queue_length_limits_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "queue_master_location_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "queue_parallel_SUITE", size = "large", additional_beam = [ @@ -711,19 +827,22 @@ rabbitmq_integration_suite( "quorum_queue_in_memory_bytes", "stream_queue", ], - runtime_deps = [ - "//deps/rabbit/apps/rabbitmq_prelaunch:test_bazel_erlang_lib", + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", ], - deps = DEPS, ) rabbitmq_integration_suite( + PACKAGE, name = "queue_type_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "quorum_queue_SUITE", size = "large", additional_beam = [ @@ -750,10 +869,9 @@ rabbitmq_integration_suite( "groups": ["clustered_with_partitions"], }, }, - runtime_deps = [ - "//deps/rabbit/apps/rabbitmq_prelaunch:test_bazel_erlang_lib", + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", ], - deps = DEPS, ) ct_suite( @@ -769,9 +887,12 @@ ct_suite( ) rabbitmq_integration_suite( + PACKAGE, name = "rabbit_core_metrics_gc_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) ct_suite( @@ -794,9 +915,11 @@ ct_suite( erlc( name = "test_util", + testonly = True, srcs = [ "test/test_util.erl", ], + dest = "test", ) ct_suite( @@ -886,6 +1009,7 @@ ct_suite( ) rabbitmq_integration_suite( + PACKAGE, name = "rabbit_stream_queue_SUITE", size = "large", additional_beam = [ @@ -906,36 +1030,47 @@ rabbitmq_integration_suite( "unclustered_size_3_3": {"groups": ["unclustered_size_3_3"]}, "cluster_size_3_1": {"groups": ["cluster_size_3_1"]}, }, - deps = DEPS + [ + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", "@proper//:bazel_erlang_lib", ], ) rabbitmq_integration_suite( + PACKAGE, name = "rabbitmq_queues_cli_integration_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "rabbitmqctl_integration_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "rabbitmqctl_shutdown_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "signal_handling_SUITE", size = "medium", - deps = DEPS, ) rabbitmq_integration_suite( + PACKAGE, name = "simple_ha_SUITE", size = "large", additional_beam = [ @@ -946,10 +1081,13 @@ rabbitmq_integration_suite( "cluster_size_2", "cluster_size_3", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "single_active_consumer_SUITE", size = "medium", additional_beam = [ @@ -959,13 +1097,18 @@ rabbitmq_integration_suite( "classic_queue", "quorum_queue", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "sync_detection_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) ct_suite( @@ -979,36 +1122,46 @@ ct_suite( ) rabbitmq_integration_suite( + PACKAGE, name = "topic_permission_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "unit_access_control_authn_authz_context_propagation_SUITE", size = "medium", additional_srcs = [ "test/rabbit_auth_backend_context_propagation_mock.erl", "test/rabbit_foo_protocol_connection_info.erl", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "unit_access_control_credential_validation_SUITE", size = "medium", - deps = DEPS + [ + deps = [ "@proper//:bazel_erlang_lib", ], ) rabbitmq_integration_suite( + PACKAGE, name = "unit_access_control_SUITE", size = "medium", additional_srcs = [ "test/rabbit_dummy_protocol_connection_info.erl", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) ct_suite( @@ -1021,15 +1174,21 @@ ct_suite( ) rabbitmq_integration_suite( + PACKAGE, name = "unit_amqp091_server_properties_SUITE", size = "small", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "unit_app_management_SUITE", size = "small", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) ct_suite( @@ -1062,39 +1221,45 @@ ct_suite( ) rabbitmq_integration_suite( + PACKAGE, name = "unit_connection_tracking_SUITE", size = "small", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "unit_credit_flow_SUITE", size = "small", - deps = DEPS, ) rabbitmq_integration_suite( + PACKAGE, name = "unit_disk_monitor_mocks_SUITE", size = "small", - deps = DEPS, ) rabbitmq_integration_suite( + PACKAGE, name = "unit_disk_monitor_SUITE", size = "small", - deps = DEPS, ) rabbitmq_integration_suite( + PACKAGE, name = "unit_file_handle_cache_SUITE", size = "small", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "unit_gen_server2_SUITE", size = "small", - deps = DEPS, ) ct_suite( @@ -1108,9 +1273,12 @@ ct_suite( ) rabbitmq_integration_suite( + PACKAGE, name = "unit_log_management_SUITE", size = "small", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) ct_suite( @@ -1151,9 +1319,9 @@ ct_suite( ) rabbitmq_integration_suite( + PACKAGE, name = "unit_policy_validators_SUITE", size = "small", - deps = DEPS, ) ct_suite( @@ -1169,12 +1337,15 @@ ct_suite( ) rabbitmq_integration_suite( + PACKAGE, name = "unit_stats_and_metrics_SUITE", size = "small", additional_srcs = [ "test/dummy_event_receiver.erl", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) ct_suite( @@ -1190,18 +1361,22 @@ ct_suite( ) rabbitmq_integration_suite( + PACKAGE, name = "unit_vm_memory_monitor_SUITE", size = "small", - deps = DEPS, ) rabbitmq_integration_suite( + PACKAGE, name = "upgrade_preparation_SUITE", size = "medium", - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) rabbitmq_integration_suite( + PACKAGE, name = "vhost_SUITE", size = "medium", groups = [ @@ -1210,5 +1385,7 @@ rabbitmq_integration_suite( "cluster_size_1_direct", "cluster_size_2_direct", ], - deps = DEPS, + deps = [ + "//deps/rabbit_common:bazel_erlang_lib", + ], ) diff --git a/rabbitmq.bzl b/rabbitmq.bzl index 3f9102c53c..3ccef341b2 100644 --- a/rabbitmq.bzl +++ b/rabbitmq.bzl @@ -17,16 +17,6 @@ RABBITMQ_TEST_ERLC_OPTS = DEFAULT_TEST_ERLC_OPTS + [ APP_VERSION = "3.9.0" -def required_plugins(rabbitmq_workspace = "@rabbitmq-server"): - return [ - rabbitmq_workspace + "//deps/rabbit:bazel_erlang_lib", - ] - -def management_plugins(rabbitmq_workspace = "@rabbitmq-server"): - return [ - rabbitmq_workspace + "//deps/rabbitmq_management:bazel_erlang_lib", - ] - LABELS_WITH_TEST_VERSIONS = [ "//deps/amqp10_common:bazel_erlang_lib", "//deps/rabbit_common:bazel_erlang_lib", @@ -88,6 +78,7 @@ def rabbitmq_lib( ) def rabbitmq_integration_suite( + package, data = [], extra_erlc_opts = [], test_env = {}, @@ -103,12 +94,12 @@ def rabbitmq_integration_suite( ] + data, test_env = dict({ "RABBITMQ_CT_SKIP_AS_ERROR": "true", - "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/rabbitmq-for-tests-run", - "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/broker-for-tests-home/sbin/rabbitmqctl", - "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/broker-for-tests-home/sbin/rabbitmq-plugins", + "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/rabbitmq-for-tests-run".format(package), + "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), }.items() + test_env.items()), tools = [ - "//:rabbitmq-for-tests-run", + ":rabbitmq-for-tests-run", ] + tools, runtime_deps = [ "//deps/rabbitmq_cli:elixir_as_bazel_erlang_lib", |