Skip to content

Commit 44d6f10

Browse files
HoloRinHoloRin
committed
Revert "Default all rabbitmq_integration_suite to flaky in bazel"
This reverts commit 03d1ecc.
1 parent b572431 commit 44d6f10

File tree

23 files changed

+51
-48
lines changed

23 files changed

+51
-48
lines changed

‎deps/rabbit/BUILD.bazel

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ rabbitmq_integration_suite(
344344
},
345345
"cluster_size_3": {
346346
"groups": ["cluster_size_3"],
347+
"flaky": True,
347348
},
348349
},
349350
)
@@ -358,6 +359,7 @@ rabbitmq_integration_suite(
358359
PACKAGE,
359360
name = "clustering_management_SUITE",
360361
size = "large",
362+
flaky = True,
361363
matrix = ct_group_matrix([
362364
"unclustered_2_nodes",
363365
"unclustered_3_nodes",
@@ -373,7 +375,6 @@ rabbitmq_integration_suite(
373375
data = [
374376
"test/definition_import_SUITE_data/case1.json",
375377
],
376-
flaky = False,
377378
)
378379

379380
rabbitmq_integration_suite(
@@ -404,6 +405,7 @@ rabbitmq_integration_suite(
404405
additional_beam = [
405406
":quorum_queue_utils",
406407
],
408+
flaky = True,
407409
)
408410

409411
rabbitmq_integration_suite(
@@ -474,6 +476,7 @@ rabbitmq_integration_suite(
474476
additional_beam = [
475477
":sync_detection_SUITE_beam_files",
476478
],
479+
flaky = True,
477480
matrix = ct_group_case_matrix({
478481
"non_parallel_tests": [
479482
"eager_sync",
@@ -519,6 +522,7 @@ rabbitmq_integration_suite(
519522
"enabling_in_cluster-enable_feature_flag_when_ff_file_is_unwritable": {
520523
"groups": ["enabling_in_cluster"],
521524
"cases": ["enable_feature_flag_when_ff_file_is_unwritable"],
525+
"flaky": True,
522526
# The enabling_* tests chmod files and then expect writes to be blocked.
523527
# This probably doesn't work because we are root in the remote docker image.
524528
"tags": ["exclusive"],
@@ -533,6 +537,7 @@ rabbitmq_integration_suite(
533537
},
534538
"clustering": {
535539
"groups": ["clustering"],
540+
"flaky": True,
536541
},
537542
"activating_plugin": {
538543
"groups": ["activating_plugin"],
@@ -626,6 +631,7 @@ rabbitmq_integration_suite(
626631
PACKAGE,
627632
name = "peer_discovery_classic_config_SUITE",
628633
size = "medium",
634+
flaky = True,
629635
matrix = ct_group_case_matrix({
630636
"non_parallel": [
631637
"successful_discovery",
@@ -779,9 +785,11 @@ rabbitmq_integration_suite(
779785
},
780786
"clustered-cluster_size_2": {
781787
"groups": ["cluster_size_2"],
788+
"flaky": True,
782789
},
783790
"clustered-cluster_size_3": {
784791
"groups": ["cluster_size_3"],
792+
"flaky": True,
785793
},
786794
"clustered-cluster_size_5": {
787795
"groups": ["cluster_size_5"],
@@ -900,18 +908,24 @@ rabbitmq_integration_suite(
900908
additional_beam = [
901909
":quorum_queue_utils",
902910
],
903-
matrix = ct_group_matrix([
904-
"single_node",
905-
"single_node_parallel",
906-
"cluster_size_2",
907-
"cluster_size_2_parallel",
908-
"cluster_size_3",
909-
"cluster_size_3_parallel",
910-
"unclustered_size_3_1",
911-
"unclustered_size_3_2",
912-
"unclustered_size_3_3",
913-
"cluster_size_3_1",
914-
]),
911+
matrix = {
912+
"single_node": {"groups": ["single_node"]},
913+
"single_node_parallel": {"groups": ["single_node_parallel"]},
914+
"cluster_size_2": {"groups": ["cluster_size_2"]},
915+
"cluster_size_2_parallel": {"groups": ["cluster_size_2_parallel"]},
916+
"cluster_size_3": {
917+
"groups": ["cluster_size_3"],
918+
"flaky": True,
919+
},
920+
"cluster_size_3_parallel": {
921+
"groups": ["cluster_size_3_parallel"],
922+
"flaky": True,
923+
},
924+
"unclustered_size_3_1": {"groups": ["unclustered_size_3_1"]},
925+
"unclustered_size_3_2": {"groups": ["unclustered_size_3_2"]},
926+
"unclustered_size_3_3": {"groups": ["unclustered_size_3_3"]},
927+
"cluster_size_3_1": {"groups": ["cluster_size_3_1"]},
928+
},
915929
deps = [
916930
"@proper//:bazel_erlang_lib",
917931
],

‎deps/rabbitmq_amqp1_0/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ rabbitmq_integration_suite(
8686
rabbitmq_integration_suite(
8787
PACKAGE,
8888
name = "system_SUITE",
89+
flaky = True,
8990
matrix = ct_group_matrix([
9091
"dotnet",
9192
"java",

‎deps/rabbitmq_auth_backend_cache/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ PACKAGE = "deps/rabbitmq_auth_backend_cache"
6060
rabbitmq_integration_suite(
6161
PACKAGE,
6262
name = "config_schema_SUITE",
63-
flaky = False,
6463
)
6564

6665
rabbitmq_integration_suite(

‎deps/rabbitmq_auth_backend_http/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ rabbitmq_suite(
8282
rabbitmq_integration_suite(
8383
PACKAGE,
8484
name = "config_schema_SUITE",
85-
flaky = False,
8685
)
8786

8887
rabbitmq_suite(

‎deps/rabbitmq_auth_backend_ldap/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ PACKAGE = "deps/rabbitmq_auth_backend_ldap"
8484
rabbitmq_integration_suite(
8585
PACKAGE,
8686
name = "config_schema_SUITE",
87-
flaky = False,
8887
)
8988

9089
rabbitmq_integration_suite(

‎deps/rabbitmq_auth_backend_oauth2/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ rabbitmq_integration_suite(
6969
rabbitmq_integration_suite(
7070
PACKAGE,
7171
name = "config_schema_SUITE",
72-
flaky = False,
7372
)
7473

7574
rabbitmq_integration_suite(

‎deps/rabbitmq_event_exchange/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ PACKAGE = "deps/rabbitmq_event_exchange"
3939
rabbitmq_integration_suite(
4040
PACKAGE,
4141
name = "config_schema_SUITE",
42-
flaky = False,
4342
)
4443

4544
rabbitmq_integration_suite(

‎deps/rabbitmq_federation/BUILD.bazel

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,15 @@ rabbitmq_integration_suite(
101101
additional_beam = [
102102
":rabbit_federation_test_util",
103103
],
104-
matrix = ct_group_matrix([
105-
"classic_queue",
106-
"quorum_queue",
107-
]),
104+
matrix = {
105+
"classic_queue": {
106+
"groups": ["classic_queue"],
107+
},
108+
"quorum_queue": {
109+
"groups": ["quorum_queue"],
110+
"flaky": True,
111+
},
112+
},
108113
)
109114

110115
rabbitmq_integration_suite(

‎deps/rabbitmq_management/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ rabbitmq_integration_suite(
120120
PACKAGE,
121121
name = "config_schema_SUITE",
122122
size = "small",
123-
flaky = False,
124123
)
125124

126125
rabbitmq_suite(

‎deps/rabbitmq_mqtt/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ rabbitmq_integration_suite(
125125
rabbitmq_integration_suite(
126126
PACKAGE,
127127
name = "config_schema_SUITE",
128-
flaky = False,
129128
)
130129

131130
rabbitmq_integration_suite(
132131
PACKAGE,
133132
name = "java_SUITE",
133+
flaky = True,
134134
)
135135

136136
rabbitmq_suite(

‎deps/rabbitmq_peer_discovery_aws/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ rabbitmq_integration_suite(
5757
PACKAGE,
5858
name = "config_schema_SUITE",
5959
size = "small",
60-
flaky = False,
6160
)
6261

6362
# NOTE: integration_SUITE requires aws credentials and a docker image.

‎deps/rabbitmq_peer_discovery_common/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,4 @@ PACKAGE = "deps/rabbitmq_peer_discovery_common"
6969
rabbitmq_integration_suite(
7070
PACKAGE,
7171
name = "config_schema_SUITE",
72-
flaky = False,
7372
)

‎deps/rabbitmq_peer_discovery_consul/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ PACKAGE = "deps/rabbitmq_peer_discovery_consul"
4747
rabbitmq_integration_suite(
4848
PACKAGE,
4949
name = "config_schema_SUITE",
50-
flaky = False,
5150
)
5251

5352
rabbitmq_suite(

‎deps/rabbitmq_peer_discovery_etcd/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ PACKAGE = "deps/rabbitmq_peer_discovery_etcd"
4949
rabbitmq_integration_suite(
5050
PACKAGE,
5151
name = "config_schema_SUITE",
52-
flaky = False,
5352
)
5453

5554
rabbitmq_integration_suite(

‎deps/rabbitmq_peer_discovery_k8s/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ PACKAGE = "deps/rabbitmq_peer_discovery_k8s"
4747
rabbitmq_integration_suite(
4848
PACKAGE,
4949
name = "config_schema_SUITE",
50-
flaky = False,
5150
)
5251

5352
rabbitmq_suite(

‎deps/rabbitmq_prometheus/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ PACKAGE = "deps/rabbitmq_prometheus"
5555
rabbitmq_integration_suite(
5656
PACKAGE,
5757
name = "config_schema_SUITE",
58-
flaky = False,
5958
)
6059

6160
rabbitmq_integration_suite(
6261
PACKAGE,
6362
name = "rabbit_prometheus_http_SUITE",
6463
size = "small",
64+
flaky = True,
6565
)

‎deps/rabbitmq_shovel/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ rabbitmq_integration_suite(
137137
additional_beam = [
138138
":shovel_test_utils",
139139
],
140+
flaky = True,
140141
)
141142

142143
rabbitmq_suite(

‎deps/rabbitmq_stomp/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ rabbitmq_integration_suite(
105105
PACKAGE,
106106
name = "config_schema_SUITE",
107107
size = "small",
108-
flaky = False,
109108
)
110109

111110
rabbitmq_integration_suite(

‎deps/rabbitmq_stream/BUILD.bazel

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("@bazel-erlang//:ct.bzl", "ct_group_matrix")
21
load("@bazel-erlang//:xref.bzl", "xref")
32
load("@bazel-erlang//:dialyze.bzl", "dialyze")
43
load(
@@ -84,16 +83,20 @@ rabbitmq_integration_suite(
8483
rabbitmq_integration_suite(
8584
PACKAGE,
8685
name = "config_schema_SUITE",
87-
flaky = False,
8886
)
8987

9088
rabbitmq_integration_suite(
9189
PACKAGE,
9290
name = "rabbit_stream_SUITE",
93-
matrix = ct_group_matrix([
94-
"single_node",
95-
"cluster",
96-
]),
91+
matrix = {
92+
"single_node": {
93+
"groups": ["single_node"],
94+
},
95+
"cluster": {
96+
"groups": ["cluster"],
97+
"flaky": True,
98+
},
99+
},
97100
deps = [
98101
"//deps/rabbitmq_stream_common:bazel_erlang_lib",
99102
],

‎deps/rabbitmq_trust_store/BUILD.bazel

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ rabbitmq_lib(
4848
deps = DEPS,
4949
)
5050

51-
xref(
52-
size = "small",
53-
tags = ["xref"],
54-
)
51+
xref(tags = ["xref"])
5552

5653
plt(
5754
name = "base_plt",
@@ -60,7 +57,6 @@ plt(
6057
)
6158

6259
dialyze(
63-
size = "small",
6460
dialyzer_opts = RABBITMQ_DIALYZER_OPTS,
6561
plt = ":base_plt",
6662
tags = ["dialyze"],
@@ -86,13 +82,12 @@ PACKAGE = "deps/rabbitmq_trust_store"
8682
rabbitmq_integration_suite(
8783
PACKAGE,
8884
name = "config_schema_SUITE",
89-
size = "small",
90-
flaky = False,
9185
)
9286

9387
rabbitmq_integration_suite(
9488
PACKAGE,
9589
name = "system_SUITE",
90+
flaky = True,
9691
matrix = ct_group_matrix([
9792
"file_provider_tests",
9893
"http_provider_tests",

‎deps/rabbitmq_web_mqtt/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ PACKAGE = "deps/rabbitmq_web_mqtt"
6363
rabbitmq_integration_suite(
6464
PACKAGE,
6565
name = "config_schema_SUITE",
66-
flaky = False,
6766
)
6867

6968
rabbitmq_integration_suite(

‎deps/rabbitmq_web_stomp/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ rabbitmq_integration_suite(
8484
rabbitmq_integration_suite(
8585
PACKAGE,
8686
name = "config_schema_SUITE",
87-
flaky = False,
8887
)
8988

9089
rabbitmq_integration_suite(

‎rabbitmq.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ def rabbitmq_integration_suite(
113113
tools = [],
114114
deps = [],
115115
runtime_deps = [],
116-
flaky = True,
117116
**kwargs):
118117
ct_suite(
119118
erlc_opts = RABBITMQ_TEST_ERLC_OPTS + erlc_opts,
@@ -142,6 +141,5 @@ def rabbitmq_integration_suite(
142141
"//deps/rabbit_common:bazel_erlang_lib",
143142
"@rabbitmq_ct_helpers//:bazel_erlang_lib",
144143
] + deps,
145-
flaky = flaky,
146144
**kwargs
147145
)

0 commit comments

Comments
 (0)