wip

Author: dumbbell

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

@@ -750,6 +750,17 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
                      false -> ExtraArgs3;
                      _     -> ["NOBUILD=1" | ExtraArgs3]
                  end,
+    %% TODO: When we start to do mixed-version testing against 4.1.x as the
+    %% secondary umbrella, we will need to stop setting
+    %% `$RABBITMQ_FEATURE_FLAGS'.
+    MetadataStore = rabbit_ct_helpers:get_config(Config, metadata_store),
+    SecFeatureFlags0 = case MetadataStore of
+                           mnesia -> ?REQUIRED_FEATURE_FLAGS;
+                           khepri -> [khepri_db | ?REQUIRED_FEATURE_FLAGS]
+                       end,
+    SecFeatureFlags = string:join(
+                        [atom_to_list(F) || F <- SecFeatureFlags0],
+                        ","),
     ExtraArgs = case UseSecondaryUmbrella of
                     true ->
                         DepsDir = ?config(erlang_mk_depsdir, Config),
@@ -779,7 +790,8 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
                          {"RABBITMQ_SCRIPTS_DIR=~ts", [SecScriptsDir]},
                          {"RABBITMQ_SERVER=~ts/rabbitmq-server", [SecScriptsDir]},
                          {"RABBITMQCTL=~ts/rabbitmqctl", [SecScriptsDir]},
-                         {"RABBITMQ_PLUGINS=~ts/rabbitmq-plugins", [SecScriptsDir]}
+                         {"RABBITMQ_PLUGINS=~ts/rabbitmq-plugins", [SecScriptsDir]},
+                         {"RABBITMQ_FEATURE_FLAGS=~ts", [SecFeatureFlags]}
                          | ExtraArgs4];
                     false ->
                         case UseSecondaryDist of
@@ -795,30 +807,13 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
                                     {_, undefined, SrcPlugin} -> SrcPlugin;
                                     {_, SecondaryEnabledPlugins0, _} -> SecondaryEnabledPlugins0
                                 end,
-                                %% TODO: When we start to do mixed-version
-                                %% testing against 4.1.x as the secondary
-                                %% umbrella, we will need to stop setting
-                                %% `$RABBITMQ_FEATURE_FLAGS'.
-                                MetadataStore = rabbit_ct_helpers:get_config(
-                                                  Config, metadata_store),
-                                FeatureFlags = case MetadataStore of
-                                                   mnesia ->
-                                                       ?REQUIRED_FEATURE_FLAGS;
-                                                   khepri ->
-                                                       [khepri_db |
-                                                        ?REQUIRED_FEATURE_FLAGS]
-                                               end,
-                                FeatureFlags1 = string:join(
-                                                  [atom_to_list(F) ||
-                                                   F <- FeatureFlags],
-                                                  ","),
                                 [{"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", [SecondaryEnabledPlugins]},
-                                 {"RABBITMQ_FEATURE_FLAGS=~ts", [FeatureFlags1]}
+                                 {"RABBITMQ_FEATURE_FLAGS=~ts", [SecFeatureFlags]}
                                 | ExtraArgs4];
                             false ->
                                 ExtraArgs4