OK?

Author: lhoguin

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

@@ -769,10 +769,15 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
                         case UseSecondaryDist of
                             true ->
                                 SecondaryDist = ?config(secondary_dist, Config),
-                                SecondaryEnabledPlugins = case {?config(secondary_enabled_plugins, Config), filename:basename(SrcDir)} of
-                                    {undefined, "rabbit"} -> "";
-                                    {undefined, SrcPlugin} -> SrcPlugin;
-                                    {SecondaryEnabledPlugins0, _} -> SecondaryEnabledPlugins0
+                                SecondaryEnabledPlugins = case {
+                                    StartWithPluginsDisabled,
+                                    ?config(secondary_enabled_plugins, Config),
+                                    filename:basename(SrcDir)
+                                } of
+                                    {true, _, _} -> "";
+                                    {_, undefined, "rabbit"} -> "";
+                                    {_, undefined, SrcPlugin} -> SrcPlugin;
+                                    {_, SecondaryEnabledPlugins0, _} -> SecondaryEnabledPlugins0
                                 end,
                                 [{"DIST_DIR=~ts/plugins", [SecondaryDist]},
                                  {"CLI_SCRIPTS_DIR=~ts/sbin", [SecondaryDist]},