diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-06-21 16:10:38 +0200 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-06-21 16:10:38 +0200 |
| commit | 70cb8147b25b5e10f04db61c83b867e422cc5171 (patch) | |
| tree | d55845dc586dd656ad8d72c6becaf85617e45370 | |
| parent | d8c4c0a8879edce92e22bd57cdb01746edaa2c2e (diff) | |
| download | rabbitmq-server-git-70cb8147b25b5e10f04db61c83b867e422cc5171.tar.gz | |
Default all `rabbitmq_integration_suite` to flaky in bazel
Most tests that can start rabbitmq nodes have some chance of
flaking. Rather than chase individual flakes for now, this commit
changes the default (though it can still be overriden, as is the case
for config_scheme_SUITE in many places, since I have yet to see that
particular suite flake).
23 files changed, 48 insertions, 51 deletions
diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel index 7729805ff0..1ecd012b44 100644 --- a/deps/rabbit/BUILD.bazel +++ b/deps/rabbit/BUILD.bazel @@ -343,7 +343,6 @@ rabbitmq_integration_suite( }, "cluster_size_3": { "groups": ["cluster_size_3"], - "flaky": True, }, }, ) @@ -358,7 +357,6 @@ rabbitmq_integration_suite( PACKAGE, name = "clustering_management_SUITE", size = "large", - flaky = True, matrix = ct_group_matrix([ "unclustered_2_nodes", "unclustered_3_nodes", @@ -374,6 +372,7 @@ rabbitmq_integration_suite( data = [ "test/definition_import_SUITE_data/case1.json", ], + flaky = False, ) rabbitmq_integration_suite( @@ -404,7 +403,6 @@ rabbitmq_integration_suite( additional_beam = [ ":quorum_queue_utils", ], - flaky = True, ) rabbitmq_integration_suite( @@ -475,7 +473,6 @@ rabbitmq_integration_suite( additional_beam = [ ":sync_detection_SUITE_beam_files", ], - flaky = True, matrix = ct_group_case_matrix({ "non_parallel_tests": [ "eager_sync", @@ -521,7 +518,6 @@ rabbitmq_integration_suite( "enabling_in_cluster-enable_feature_flag_when_ff_file_is_unwritable": { "groups": ["enabling_in_cluster"], "cases": ["enable_feature_flag_when_ff_file_is_unwritable"], - "flaky": True, # The enabling_* tests chmod files and then expect writes to be blocked. # This probably doesn't work because we are root in the remote docker image. "tags": ["exclusive"], @@ -536,7 +532,6 @@ rabbitmq_integration_suite( }, "clustering": { "groups": ["clustering"], - "flaky": True, }, "activating_plugin": { "groups": ["activating_plugin"], @@ -630,7 +625,6 @@ rabbitmq_integration_suite( PACKAGE, name = "peer_discovery_classic_config_SUITE", size = "medium", - flaky = True, matrix = ct_group_case_matrix({ "non_parallel": [ "successful_discovery", @@ -784,11 +778,9 @@ rabbitmq_integration_suite( }, "clustered-cluster_size_2": { "groups": ["cluster_size_2"], - "flaky": True, }, "clustered-cluster_size_3": { "groups": ["cluster_size_3"], - "flaky": True, }, "clustered-cluster_size_5": { "groups": ["cluster_size_5"], @@ -907,24 +899,18 @@ rabbitmq_integration_suite( additional_beam = [ ":quorum_queue_utils", ], - matrix = { - "single_node": {"groups": ["single_node"]}, - "single_node_parallel": {"groups": ["single_node_parallel"]}, - "cluster_size_2": {"groups": ["cluster_size_2"]}, - "cluster_size_2_parallel": {"groups": ["cluster_size_2_parallel"]}, - "cluster_size_3": { - "groups": ["cluster_size_3"], - "flaky": True, - }, - "cluster_size_3_parallel": { - "groups": ["cluster_size_3_parallel"], - "flaky": True, - }, - "unclustered_size_3_1": {"groups": ["unclustered_size_3_1"]}, - "unclustered_size_3_2": {"groups": ["unclustered_size_3_2"]}, - "unclustered_size_3_3": {"groups": ["unclustered_size_3_3"]}, - "cluster_size_3_1": {"groups": ["cluster_size_3_1"]}, - }, + matrix = ct_group_matrix([ + "single_node", + "single_node_parallel", + "cluster_size_2", + "cluster_size_2_parallel", + "cluster_size_3", + "cluster_size_3_parallel", + "unclustered_size_3_1", + "unclustered_size_3_2", + "unclustered_size_3_3", + "cluster_size_3_1", + ]), deps = [ "@proper//:bazel_erlang_lib", ], diff --git a/deps/rabbitmq_amqp1_0/BUILD.bazel b/deps/rabbitmq_amqp1_0/BUILD.bazel index 3f11d2cd37..5178a3afeb 100644 --- a/deps/rabbitmq_amqp1_0/BUILD.bazel +++ b/deps/rabbitmq_amqp1_0/BUILD.bazel @@ -86,7 +86,6 @@ rabbitmq_integration_suite( rabbitmq_integration_suite( PACKAGE, name = "system_SUITE", - flaky = True, matrix = ct_group_matrix([ "dotnet", "java", diff --git a/deps/rabbitmq_auth_backend_cache/BUILD.bazel b/deps/rabbitmq_auth_backend_cache/BUILD.bazel index f4b17365c7..a626d13ecf 100644 --- a/deps/rabbitmq_auth_backend_cache/BUILD.bazel +++ b/deps/rabbitmq_auth_backend_cache/BUILD.bazel @@ -60,6 +60,7 @@ PACKAGE = "deps/rabbitmq_auth_backend_cache" rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_integration_suite( diff --git a/deps/rabbitmq_auth_backend_http/BUILD.bazel b/deps/rabbitmq_auth_backend_http/BUILD.bazel index 46d6fde69a..780ccdc116 100644 --- a/deps/rabbitmq_auth_backend_http/BUILD.bazel +++ b/deps/rabbitmq_auth_backend_http/BUILD.bazel @@ -82,6 +82,7 @@ rabbitmq_suite( rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_suite( diff --git a/deps/rabbitmq_auth_backend_ldap/BUILD.bazel b/deps/rabbitmq_auth_backend_ldap/BUILD.bazel index 81d3efeaeb..501335c72e 100644 --- a/deps/rabbitmq_auth_backend_ldap/BUILD.bazel +++ b/deps/rabbitmq_auth_backend_ldap/BUILD.bazel @@ -84,6 +84,7 @@ PACKAGE = "deps/rabbitmq_auth_backend_ldap" rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_integration_suite( diff --git a/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel b/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel index 45f4961758..fbd820f7f7 100644 --- a/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel +++ b/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel @@ -69,6 +69,7 @@ rabbitmq_integration_suite( rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_integration_suite( diff --git a/deps/rabbitmq_event_exchange/BUILD.bazel b/deps/rabbitmq_event_exchange/BUILD.bazel index 1c811f55c6..62c61eae15 100644 --- a/deps/rabbitmq_event_exchange/BUILD.bazel +++ b/deps/rabbitmq_event_exchange/BUILD.bazel @@ -39,6 +39,7 @@ PACKAGE = "deps/rabbitmq_event_exchange" rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_integration_suite( diff --git a/deps/rabbitmq_federation/BUILD.bazel b/deps/rabbitmq_federation/BUILD.bazel index a24d0e6cfd..dfa87b20f5 100644 --- a/deps/rabbitmq_federation/BUILD.bazel +++ b/deps/rabbitmq_federation/BUILD.bazel @@ -101,15 +101,10 @@ rabbitmq_integration_suite( additional_beam = [ ":rabbit_federation_test_util", ], - matrix = { - "classic_queue": { - "groups": ["classic_queue"], - }, - "quorum_queue": { - "groups": ["quorum_queue"], - "flaky": True, - }, - }, + matrix = ct_group_matrix([ + "classic_queue", + "quorum_queue", + ]), ) rabbitmq_integration_suite( diff --git a/deps/rabbitmq_management/BUILD.bazel b/deps/rabbitmq_management/BUILD.bazel index e6e7b2b0de..1b542aae9f 100644 --- a/deps/rabbitmq_management/BUILD.bazel +++ b/deps/rabbitmq_management/BUILD.bazel @@ -120,6 +120,7 @@ rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", size = "small", + flaky = False, ) rabbitmq_suite( diff --git a/deps/rabbitmq_mqtt/BUILD.bazel b/deps/rabbitmq_mqtt/BUILD.bazel index f6db008450..0b6985e777 100644 --- a/deps/rabbitmq_mqtt/BUILD.bazel +++ b/deps/rabbitmq_mqtt/BUILD.bazel @@ -125,12 +125,12 @@ rabbitmq_integration_suite( rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_integration_suite( PACKAGE, name = "java_SUITE", - flaky = True, ) rabbitmq_suite( diff --git a/deps/rabbitmq_peer_discovery_aws/BUILD.bazel b/deps/rabbitmq_peer_discovery_aws/BUILD.bazel index a0b11a6953..4dd4177695 100644 --- a/deps/rabbitmq_peer_discovery_aws/BUILD.bazel +++ b/deps/rabbitmq_peer_discovery_aws/BUILD.bazel @@ -57,6 +57,7 @@ rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", size = "small", + flaky = False, ) # NOTE: integration_SUITE requires aws credentials and a docker image. diff --git a/deps/rabbitmq_peer_discovery_common/BUILD.bazel b/deps/rabbitmq_peer_discovery_common/BUILD.bazel index 20d8d036cd..e88a3505d6 100644 --- a/deps/rabbitmq_peer_discovery_common/BUILD.bazel +++ b/deps/rabbitmq_peer_discovery_common/BUILD.bazel @@ -69,4 +69,5 @@ PACKAGE = "deps/rabbitmq_peer_discovery_common" rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) diff --git a/deps/rabbitmq_peer_discovery_consul/BUILD.bazel b/deps/rabbitmq_peer_discovery_consul/BUILD.bazel index 34db9a33e8..305987401f 100644 --- a/deps/rabbitmq_peer_discovery_consul/BUILD.bazel +++ b/deps/rabbitmq_peer_discovery_consul/BUILD.bazel @@ -47,6 +47,7 @@ PACKAGE = "deps/rabbitmq_peer_discovery_consul" rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_suite( diff --git a/deps/rabbitmq_peer_discovery_etcd/BUILD.bazel b/deps/rabbitmq_peer_discovery_etcd/BUILD.bazel index 3657a7fae5..2f3a35fece 100644 --- a/deps/rabbitmq_peer_discovery_etcd/BUILD.bazel +++ b/deps/rabbitmq_peer_discovery_etcd/BUILD.bazel @@ -49,6 +49,7 @@ PACKAGE = "deps/rabbitmq_peer_discovery_etcd" rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_integration_suite( diff --git a/deps/rabbitmq_peer_discovery_k8s/BUILD.bazel b/deps/rabbitmq_peer_discovery_k8s/BUILD.bazel index a0783517da..385d0e8c67 100644 --- a/deps/rabbitmq_peer_discovery_k8s/BUILD.bazel +++ b/deps/rabbitmq_peer_discovery_k8s/BUILD.bazel @@ -47,6 +47,7 @@ PACKAGE = "deps/rabbitmq_peer_discovery_k8s" rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_suite( diff --git a/deps/rabbitmq_prometheus/BUILD.bazel b/deps/rabbitmq_prometheus/BUILD.bazel index 700848a721..4caf9df060 100644 --- a/deps/rabbitmq_prometheus/BUILD.bazel +++ b/deps/rabbitmq_prometheus/BUILD.bazel @@ -55,11 +55,11 @@ PACKAGE = "deps/rabbitmq_prometheus" rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_integration_suite( PACKAGE, name = "rabbit_prometheus_http_SUITE", size = "small", - flaky = True, ) diff --git a/deps/rabbitmq_shovel/BUILD.bazel b/deps/rabbitmq_shovel/BUILD.bazel index e2c639d9bf..2ed489e315 100644 --- a/deps/rabbitmq_shovel/BUILD.bazel +++ b/deps/rabbitmq_shovel/BUILD.bazel @@ -137,7 +137,6 @@ rabbitmq_integration_suite( additional_beam = [ ":shovel_test_utils", ], - flaky = True, ) rabbitmq_suite( diff --git a/deps/rabbitmq_stomp/BUILD.bazel b/deps/rabbitmq_stomp/BUILD.bazel index a3bce06671..53cab40598 100644 --- a/deps/rabbitmq_stomp/BUILD.bazel +++ b/deps/rabbitmq_stomp/BUILD.bazel @@ -105,6 +105,7 @@ rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", size = "small", + flaky = False, ) rabbitmq_integration_suite( diff --git a/deps/rabbitmq_stream/BUILD.bazel b/deps/rabbitmq_stream/BUILD.bazel index 5e4dc5b87e..3b3d91e09a 100644 --- a/deps/rabbitmq_stream/BUILD.bazel +++ b/deps/rabbitmq_stream/BUILD.bazel @@ -1,3 +1,4 @@ +load("@bazel-erlang//:ct.bzl", "ct_group_matrix") load("@bazel-erlang//:xref.bzl", "xref") load("@bazel-erlang//:dialyze.bzl", "dialyze") load( @@ -83,20 +84,16 @@ rabbitmq_integration_suite( rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_integration_suite( PACKAGE, name = "rabbit_stream_SUITE", - matrix = { - "single_node": { - "groups": ["single_node"], - }, - "cluster": { - "groups": ["cluster"], - "flaky": True, - }, - }, + matrix = ct_group_matrix([ + "single_node", + "cluster", + ]), deps = [ "//deps/rabbitmq_stream_common:bazel_erlang_lib", ], diff --git a/deps/rabbitmq_trust_store/BUILD.bazel b/deps/rabbitmq_trust_store/BUILD.bazel index ae18c90cf3..327352bb32 100644 --- a/deps/rabbitmq_trust_store/BUILD.bazel +++ b/deps/rabbitmq_trust_store/BUILD.bazel @@ -48,7 +48,10 @@ rabbitmq_lib( deps = DEPS, ) -xref(tags = ["xref"]) +xref( + size = "small", + tags = ["xref"], +) plt( name = "base_plt", @@ -57,6 +60,7 @@ plt( ) dialyze( + size = "small", dialyzer_opts = RABBITMQ_DIALYZER_OPTS, plt = ":base_plt", tags = ["dialyze"], @@ -82,12 +86,13 @@ PACKAGE = "deps/rabbitmq_trust_store" rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + size = "small", + flaky = False, ) rabbitmq_integration_suite( PACKAGE, name = "system_SUITE", - flaky = True, matrix = ct_group_matrix([ "file_provider_tests", "http_provider_tests", diff --git a/deps/rabbitmq_web_mqtt/BUILD.bazel b/deps/rabbitmq_web_mqtt/BUILD.bazel index e950828f8c..d524a80251 100644 --- a/deps/rabbitmq_web_mqtt/BUILD.bazel +++ b/deps/rabbitmq_web_mqtt/BUILD.bazel @@ -63,6 +63,7 @@ PACKAGE = "deps/rabbitmq_web_mqtt" rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_integration_suite( diff --git a/deps/rabbitmq_web_stomp/BUILD.bazel b/deps/rabbitmq_web_stomp/BUILD.bazel index 956521c173..01ebf1c786 100644 --- a/deps/rabbitmq_web_stomp/BUILD.bazel +++ b/deps/rabbitmq_web_stomp/BUILD.bazel @@ -84,6 +84,7 @@ rabbitmq_integration_suite( rabbitmq_integration_suite( PACKAGE, name = "config_schema_SUITE", + flaky = False, ) rabbitmq_integration_suite( diff --git a/rabbitmq.bzl b/rabbitmq.bzl index 5ab3430c92..9d95aa6c81 100644 --- a/rabbitmq.bzl +++ b/rabbitmq.bzl @@ -113,6 +113,7 @@ def rabbitmq_integration_suite( tools = [], deps = [], runtime_deps = [], + flaky = True, **kwargs): ct_suite( erlc_opts = RABBITMQ_TEST_ERLC_OPTS + erlc_opts, @@ -141,5 +142,6 @@ def rabbitmq_integration_suite( "//deps/rabbit_common:bazel_erlang_lib", "@rabbitmq_ct_helpers//:bazel_erlang_lib", ] + deps, + flaky = flaky, **kwargs ) |
