test(ds): simplify cluster test setups

apps/emqx/integration_test/emqx_ds_SUITE.erl

@@ -72,30 +72,19 @@ end_per_testcase(_TestCase, _Config) ->
 %%------------------------------------------------------------------------------
 
 cluster(#{n := N}) ->
-    Node1 = ds_SUITE1,
+    Spec = #{role => core, apps => app_specs()},
-    Spec = #{
+    lists:map(
-        role => core,
-        join_to => emqx_cth_cluster:node_name(Node1),
-        apps => app_specs()
-    },
-    [
-        {Node1, Spec}
-        | lists:map(
         fun(M) ->
-                Name = binary_to_atom(<<"ds_SUITE", (integer_to_binary(M))/binary>>),
+            Name = list_to_atom("ds_SUITE" ++ integer_to_list(M)),
             {Name, Spec}
         end,
-            lists:seq(2, N)
+        lists:seq(1, N)
-        )
+    ).
-    ].
 
 app_specs() ->
     [
         emqx_durable_storage,
-        {emqx, #{
+        {emqx, "persistent_session_store = {ds = true}"}
-            config => #{persistent_session_store => #{ds => true}},
-            override_env => [{boot_modules, [broker, listeners]}]
-        }}
     ].
 
 get_mqtt_port(Node, Type) ->

apps/emqx/test/emqx_persistent_messages_SUITE.erl

@@ -315,21 +315,13 @@ get_iterator_ids(Node, ClientId) ->
 app_specs() ->
     [
         emqx_durable_storage,
-        {emqx, #{
+        {emqx, "persistent_session_store {ds = true}"}
-            config => #{persistent_session_store => #{ds => true}},
-            override_env => [{boot_modules, [broker, listeners]}]
-        }}
     ].
 
 cluster() ->
-    Node1 = persistent_messages_SUITE1,
+    Spec = #{role => core, apps => app_specs()},
-    Spec = #{
-        role => core,
-        join_to => emqx_cth_cluster:node_name(Node1),
-        apps => app_specs()
-    },
     [
-        {Node1, Spec},
+        {persistent_messages_SUITE1, Spec},
         {persistent_messages_SUITE2, Spec}
     ].