Skip to content

Commit 03d1ecc

Browse files
HoloRinHoloRin
committed
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). (cherry picked from commit 70cb814)
1 parent 223745d commit 03d1ecc

File tree

23 files changed

+48
-51
lines changed

23 files changed

+48
-51
lines changed

‎deps/rabbit/BUILD.bazel‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@ rabbitmq_integration_suite(
343343
},
344344
"cluster_size_3": {
345345
"groups": ["cluster_size_3"],
346-
"flaky": True,
347346
},
348347
},
349348
)
@@ -358,7 +357,6 @@ rabbitmq_integration_suite(
358357
PACKAGE,
359358
name = "clustering_management_SUITE",
360359
size = "large",
361-
flaky = True,
362360
matrix = ct_group_matrix([
363361
"unclustered_2_nodes",
364362
"unclustered_3_nodes",
@@ -374,6 +372,7 @@ rabbitmq_integration_suite(
374372
data = [
375373
"test/definition_import_SUITE_data/case1.json",
376374
],
375+
flaky = False,
377376
)
378377

379378
rabbitmq_integration_suite(
@@ -404,7 +403,6 @@ rabbitmq_integration_suite(
404403
additional_beam = [
405404
":quorum_queue_utils",
406405
],
407-
flaky = True,
408406
)
409407

410408
rabbitmq_integration_suite(
@@ -475,7 +473,6 @@ rabbitmq_integration_suite(
475473
additional_beam = [
476474
":sync_detection_SUITE_beam_files",
477475
],
478-
flaky = True,
479476
matrix = ct_group_case_matrix({
480477
"non_parallel_tests": [
481478
"eager_sync",
@@ -521,7 +518,6 @@ rabbitmq_integration_suite(
521518
"enabling_in_cluster-enable_feature_flag_when_ff_file_is_unwritable": {
522519
"groups": ["enabling_in_cluster"],
523520
"cases": ["enable_feature_flag_when_ff_file_is_unwritable"],
524-
"flaky": True,
525521
# The enabling_* tests chmod files and then expect writes to be blocked.
526522
# This probably doesn't work because we are root in the remote docker image.
527523
"tags": ["exclusive"],
@@ -536,7 +532,6 @@ rabbitmq_integration_suite(
536532
},
537533
"clustering": {
538534
"groups": ["clustering"],
539-
"flaky": True,
540535
},
541536
"activating_plugin": {
542537
"groups": ["activating_plugin"],
@@ -630,7 +625,6 @@ rabbitmq_integration_suite(
630625
PACKAGE,
631626
name = "peer_discovery_classic_config_SUITE",
632627
size = "medium",
633-
flaky = True,
634628
matrix = ct_group_case_matrix({
635629
"non_parallel": [
636630
"successful_discovery",
@@ -784,11 +778,9 @@ rabbitmq_integration_suite(
784778
},
785779
"clustered-cluster_size_2": {
786780
"groups": ["cluster_size_2"],
787-
"flaky": True,
788781
},
789782
"clustered-cluster_size_3": {
790783
"groups": ["cluster_size_3"],
791-
"flaky": True,
792784
},
793785
"clustered-cluster_size_5": {
794786
"groups": ["cluster_size_5"],
@@ -907,24 +899,18 @@ rabbitmq_integration_suite(
907899
additional_beam = [
908900
":quorum_queue_utils",
909901
],
910-
matrix = {
911-
"single_node": {"groups": ["single_node"]},
912-
"single_node_parallel": {"groups": ["single_node_parallel"]},
913-
"cluster_size_2": {"groups": ["cluster_size_2"]},
914-
"cluster_size_2_parallel": {"groups": ["cluster_size_2_parallel"]},
915-
"cluster_size_3": {
916-
"groups": ["cluster_size_3"],
917-
"flaky": True,
918-
},
919-
"cluster_size_3_parallel": {
920-
"groups": ["cluster_size_3_parallel"],
921-
"flaky": True,
922-
},
923-
"unclustered_size_3_1": {"groups": ["unclustered_size_3_1"]},
924-
"unclustered_size_3_2": {"groups": ["unclustered_size_3_2"]},
925-
"unclustered_size_3_3": {"groups": ["unclustered_size_3_3"]},
926-
"cluster_size_3_1": {"groups": ["cluster_size_3_1"]},
927-
},
902+
matrix = ct_group_matrix([
903+
"single_node",
904+
"single_node_parallel",
905+
"cluster_size_2",
906+
"cluster_size_2_parallel",
907+
"cluster_size_3",
908+
"cluster_size_3_parallel",
909+
"unclustered_size_3_1",
910+
"unclustered_size_3_2",
911+
"unclustered_size_3_3",
912+
"cluster_size_3_1",
913+
]),
928914
deps = [
929915
"@proper//:bazel_erlang_lib",
930916
],

‎deps/rabbitmq_amqp1_0/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ rabbitmq_integration_suite(
8686
rabbitmq_integration_suite(
8787
PACKAGE,
8888
name = "system_SUITE",
89-
flaky = True,
9089
matrix = ct_group_matrix([
9190
"dotnet",
9291
"java",

‎deps/rabbitmq_auth_backend_cache/BUILD.bazel‎

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

6566
rabbitmq_integration_suite(

‎deps/rabbitmq_auth_backend_http/BUILD.bazel‎

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

8788
rabbitmq_suite(

‎deps/rabbitmq_auth_backend_ldap/BUILD.bazel‎

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

8990
rabbitmq_integration_suite(

‎deps/rabbitmq_auth_backend_oauth2/BUILD.bazel‎

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

7475
rabbitmq_integration_suite(

‎deps/rabbitmq_event_exchange/BUILD.bazel‎

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

4445
rabbitmq_integration_suite(

‎deps/rabbitmq_federation/BUILD.bazel‎

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

115110
rabbitmq_integration_suite(

‎deps/rabbitmq_management/BUILD.bazel‎

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

125126
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,
128129
)
129130

130131
rabbitmq_integration_suite(
131132
PACKAGE,
132133
name = "java_SUITE",
133-
flaky = True,
134134
)
135135

136136
rabbitmq_suite(

0 commit comments

Comments
 (0)