Fix?

Author: lhoguin

deps/rabbit/test/feature_flags_SUITE.erl

@@ -126,6 +126,7 @@ init_per_group(registry, Config) ->
     logger:set_primary_config(level, debug),
     rabbit_ct_helpers:run_steps(Config, []);
 init_per_group(feature_flags_v2, Config) ->
+    %% @todo Remove this entirely as that FF became required in 3.12.
     %% `feature_flags_v2' is now required and won't work in mixed-version
     %% clusters if the other version doesn't support it.
     case rabbit_ct_helpers:is_mixed_versions() of

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

@@ -193,10 +193,12 @@
     tcp_port_mqtt_tls,
     tcp_port_web_mqtt,
     tcp_port_web_mqtt_tls,
+    tcp_port_web_mqtt_examples,
     tcp_port_stomp,
     tcp_port_stomp_tls,
     tcp_port_web_stomp,
     tcp_port_web_stomp_tls,
+    tcp_port_web_stomp_examples,
     tcp_port_stream,
     tcp_port_stream_tls,
     tcp_port_prometheus
@@ -433,6 +435,7 @@ start_rabbitmq_node(Master, Config, NodeConfig, I) ->
             %% It's unlikely we'll ever succeed to start RabbitMQ.
             Master ! {self(), Error},
             unlink(Master);
+        %% @todo This might not work right now in at least some cases...
         {skip, _} ->
             %% Try again with another TCP port numbers base.
             NodeConfig4 = move_nonworking_nodedir_away(NodeConfig3),
@@ -506,6 +509,7 @@ tcp_port_base_for_broker0(Config, I, PortsCount) ->
 tcp_port_base_for_broker1(Base, I, PortsCount) ->
     Base + I * PortsCount * ?NODE_START_ATTEMPTS.
 
+%% @todo Refactor to simplify this...
 update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_amqp = Key | Rest]) ->
     NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig,
       {rabbit, [{tcp_listeners, [?config(Key, NodeConfig)]}]}),
@@ -533,10 +537,18 @@ update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_mqtt = Key | Rest]) ->
     NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig,
       {rabbitmq_web_mqtt, [{tcp_config, [{port, ?config(Key, NodeConfig)}]}]}),
     update_tcp_ports_in_rmq_config(NodeConfig1, Rest);
+update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_mqtt_examples = Key | Rest]) ->
+    NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig,
+      {rabbitmq_web_mqtt_examples, [{listener, [{port, ?config(Key, NodeConfig)}]}]}),
+    update_tcp_ports_in_rmq_config(NodeConfig1, Rest);
 update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_stomp = Key | Rest]) ->
     NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig,
       {rabbitmq_web_stomp, [{tcp_config, [{port, ?config(Key, NodeConfig)}]}]}),
     update_tcp_ports_in_rmq_config(NodeConfig1, Rest);
+update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_stomp_examples = Key | Rest]) ->
+    NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig,
+      {rabbitmq_web_stomp_examples, [{listener, [{port, ?config(Key, NodeConfig)}]}]}),
+    update_tcp_ports_in_rmq_config(NodeConfig1, Rest);
 update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_stomp_tls | Rest]) ->
     %% Skip this one, because we need more than just a port to configure
     update_tcp_ports_in_rmq_config(NodeConfig, Rest);
@@ -767,16 +779,16 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
                         case UseSecondaryDist of
                             true ->
                                 SecondaryDist = ?config(secondary_dist, Config),
-                                SecondaryEnabledPlugin = case filename:basename(SrcDir) of
-                                    "rabbit" -> "";
-                                    SrcPlugin -> SrcPlugin
-                                end,
+%                                SecondaryEnabledPlugin = case filename:basename(SrcDir) of
+%                                    "rabbit" -> "";
+%                                    SrcPlugin -> SrcPlugin
+%                                end,
                                 [{"DIST_DIR=~ts/plugins", [SecondaryDist]},
                                  {"CLI_SCRIPTS_DIR=~ts/sbin", [SecondaryDist]},
                                  {"CLI_ESCRIPTS_DIR=~ts/escript", [SecondaryDist]},
                                  {"RABBITMQ_SCRIPTS_DIR=~ts/sbin", [SecondaryDist]},
                                  {"RABBITMQ_SERVER=~ts/sbin/rabbitmq-server", [SecondaryDist]},
-                                 {"RABBITMQ_ENABLED_PLUGINS=~ts", [SecondaryEnabledPlugin]},
+%                                 {"RABBITMQ_ENABLED_PLUGINS=~ts", [SecondaryEnabledPlugin]},
                                  {"RABBITMQ_FEATURE_FLAGS=~ts", [?REQUIRED_FEATURE_FLAGS]}
                                 | ExtraArgs4];
                             false ->