Adjustments for the way @bazel-erlang shards tests

Author: HoloRin

deps/amqp10_client/BUILD.bazel

@@ -1,6 +1,6 @@
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze", "plt")
-load("@bazel-erlang//:ct.bzl", "ct_suite")
+load("@bazel-erlang//:ct.bzl", "ct_group_matrix", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
 load(
@@ -89,13 +89,13 @@ rabbitmq_integration_suite(
     erlc_opts = [
         "-I deps/amqp10_client",
     ],
-    groups = [
+    matrix = ct_group_matrix([
         "rabbitmq",
         "rabbitmq_strict",
         "activemq",
         "activemq_no_anon",
         "mock",
-    ],
+    ]),
     test_env = {
         "ACTIVEMQ": "$TEST_SRCDIR/$TEST_WORKSPACE/external/activemq/bin/activemq",
     },

deps/rabbit/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
+load("@bazel-erlang//:ct.bzl", "ct_group_case_matrix", "ct_group_matrix")
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze", "plt")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
@@ -357,13 +358,13 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "clustering_management_SUITE",
     size = "large",
-    groups = [
+    flaky = True,
+    matrix = ct_group_matrix([
         "unclustered_2_nodes",
         "unclustered_3_nodes",
         "clustered_2_nodes",
         "clustered_4_nodes",
-    ],
-    flaky = True,
+    ]),
 )
 
 rabbitmq_integration_suite(
@@ -422,7 +423,7 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "dynamic_ha_SUITE",
     size = "large",
-    groups = {
+    matrix = ct_group_case_matrix({
         "cluster_size_5": [
             "change_cluster",
         ],
@@ -449,7 +450,7 @@ rabbitmq_integration_suite(
             "rebalance_nodes",
             "rebalance_multiple_blocked",
         ],
-    },
+    }),
     deps = [
         "@proper//:bazel_erlang_lib",
     ],
@@ -474,18 +475,16 @@ rabbitmq_integration_suite(
     additional_beam = [
         ":sync_detection_SUITE_beam_files",
     ],
-    groups = {
+    flaky = True,
+    matrix = ct_group_case_matrix({
         "non_parallel_tests": [
-            {
-                "case": "eager_sync",
-                "flaky": True,
-            },
+            "eager_sync",
             "eager_sync_cancel",
             "eager_sync_auto",
             "eager_sync_auto_on_policy_change",
             "eager_sync_requeue",
         ],
-    },
+    }),
     tags = ["classic-queue"],
 )
 
@@ -631,19 +630,14 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "peer_discovery_classic_config_SUITE",
     size = "medium",
-    groups = {
+    flaky = True,
+    matrix = ct_group_case_matrix({
         "non_parallel": [
-            {
-                "case": "successful_discovery",
-                "flaky": True,
-            },
-            {
-                "case": "successful_discovery_with_a_subset_of_nodes_coming_online",
-                "flaky": True,
-            },
+            "successful_discovery",
+            "successful_discovery_with_a_subset_of_nodes_coming_online",
             "no_nodes_configured",
         ],
-    },
+    }),
 )
 
 rabbitmq_integration_suite(
@@ -758,14 +752,14 @@ rabbitmq_integration_suite(
     additional_beam = [
         ":quorum_queue_utils",
     ],
-    groups = [
+    matrix = ct_group_matrix([
         "classic_queue",
         "mirrored_queue",
         "quorum_queue",
         "quorum_queue_in_memory_limit",
         "quorum_queue_in_memory_bytes",
         "stream_queue",
-    ],
+    ]),
 )
 
 rabbitmq_integration_suite(
@@ -968,10 +962,10 @@ rabbitmq_integration_suite(
         ":rabbit_ha_test_consumer",
         ":rabbit_ha_test_producer",
     ],
-    groups = [
+    matrix = ct_group_matrix([
         "cluster_size_2",
         "cluster_size_3",
-    ],
+    ]),
 )
 
 rabbitmq_integration_suite(
@@ -981,10 +975,10 @@ rabbitmq_integration_suite(
     additional_beam = [
         ":quorum_queue_utils",
     ],
-    groups = [
+    matrix = ct_group_matrix([
         "classic_queue",
         "quorum_queue",
-    ],
+    ]),
 )
 
 rabbitmq_integration_suite(
@@ -1208,10 +1202,10 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "vhost_SUITE",
     size = "medium",
-    groups = [
+    matrix = ct_group_matrix([
         "cluster_size_1_network",
         "cluster_size_2_network",
         "cluster_size_1_direct",
         "cluster_size_2_direct",
-    ],
+    ]),
 )

deps/rabbitmq_amqp1_0/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(
@@ -86,10 +87,10 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "system_SUITE",
     flaky = True,
-    groups = [
+    matrix = ct_group_matrix([
         "dotnet",
         "java",
-    ],
+    ]),
     tags = [
         "dotnet",
     ],

deps/rabbitmq_federation/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
+load("@bazel-erlang//:ct.bzl", "ct_group_matrix")
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
@@ -78,12 +79,12 @@ rabbitmq_integration_suite(
     additional_beam = [
         ":rabbit_federation_test_util",
     ],
-    groups = [
+    matrix = ct_group_matrix([
         "without_automatic_setup",
         "channel_use_mode_single",
         "without_disambiguate",
         "with_disambiguate",
-    ],
+    ]),
 )
 
 rabbitmq_integration_suite(

deps/rabbitmq_stomp/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
+load("@bazel-erlang//:ct.bzl", "ct_group_matrix")
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
@@ -132,11 +133,11 @@ rabbitmq_integration_suite(
 rabbitmq_integration_suite(
     PACKAGE,
     name = "python_SUITE",
-    groups = [
+    matrix = ct_group_matrix([
         "tls",
         "implicit_connect",
         "main",
-    ],
+    ]),
 )
 
 rabbitmq_integration_suite(

deps/rabbitmq_trust_store/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", "plt")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
@@ -87,10 +88,10 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "system_SUITE",
     flaky = True,
-    groups = [
+    matrix = ct_group_matrix([
         "file_provider_tests",
         "http_provider_tests",
-    ],
+    ]),
     runtime_deps = [
         "@ct_helper//:bazel_erlang_lib",
         "@trust_store_http//:bazel_erlang_lib",