A bit more special casing for Bazel

- Allow the ssl certs to be generated with make & openssl
- Use the rabbitmq-run helper for starting/stopping the broker

Author: HoloRin

WORKSPACE.bazel

@@ -52,9 +52,7 @@ github_bazel_erlang_lib(
     version = "1.7.1",
     tag = "1.7.1",
     sha256 = "5607ea3b61fe8e715a1e711c5ce9000c8f16d4c2401c11318b76f65d11bf22d4",
-    deps = [
-        "@lager//:bazel_erlang_lib",
-    ],
+    build_file = "@rabbitmq-server//:BUILD.ranch",
 )
 
 github_bazel_erlang_lib(

src/rabbit_ct_broker_helpers.erl

@@ -727,17 +727,33 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
       {"TEST_TMPDIR=~s", [PrivDir]}
       | ExtraArgs],
     Cmd = ["start-background-broker" | MakeVars],
-    case rabbit_ct_helpers:make(Config, SrcDir, Cmd) of
-        {ok, _} ->
-            NodeConfig1 = rabbit_ct_helpers:set_config(
-                            NodeConfig,
-                            [{effective_srcdir, SrcDir},
-                             {make_vars_for_node_startup, MakeVars}]),
-            query_node(Config, NodeConfig1);
-        _ ->
-            AbortCmd = ["stop-node" | MakeVars],
-            _ = rabbit_ct_helpers:make(Config, SrcDir, AbortCmd),
-            {skip, "Failed to initialize RabbitMQ"}
+    case rabbit_ct_helpers:get_config(Config, rabbitmq_run_cmd) of
+        undefined ->
+            case rabbit_ct_helpers:make(Config, SrcDir, Cmd) of
+                {ok, _} ->
+                    NodeConfig1 = rabbit_ct_helpers:set_config(
+                                    NodeConfig,
+                                    [{effective_srcdir, SrcDir},
+                                    {make_vars_for_node_startup, MakeVars}]),
+                    query_node(Config, NodeConfig1);
+                _ ->
+                    AbortCmd = ["stop-node" | MakeVars],
+                    _ = rabbit_ct_helpers:make(Config, SrcDir, AbortCmd),
+                    {skip, "Failed to initialize RabbitMQ"}
+            end;
+        RunCmd ->
+            case rabbit_ct_helpers:exec([RunCmd | Cmd]) of
+                {ok, _} ->
+                    NodeConfig1 = rabbit_ct_helpers:set_config(
+                                    NodeConfig,
+                                    [{effective_srcdir, SrcDir},
+                                    {make_vars_for_node_startup, MakeVars}]),
+                    query_node(Config, NodeConfig1);
+                _ ->
+                    AbortCmd = ["stop-node" | MakeVars],
+                    _ = rabbit_ct_helpers:exec([RunCmd | AbortCmd]),
+                    {skip, "Failed to initialize RabbitMQ"}
+            end
     end.
 
 query_node(Config, NodeConfig) ->

src/rabbit_ct_helpers.erl

@@ -91,9 +91,10 @@ run_setup_steps(Config, ExtraSteps) ->
             [
                 fun init_skip_as_error_flag/1,
                 % fun guess_tested_erlang_app_name/1,
-                % fun ensure_rabbitmq_ct_helpers_srcdir/1,
-                fun ensure_fake_make_cmd/1,
-                % fun ensure_ssl_certs/1,
+                fun ensure_rabbitmq_ct_helpers_srcdir/1,
+                fun ensure_make_cmd/1,
+                fun ensure_rabbitmq_run_cmd/1,
+                fun ensure_ssl_certs/1,
                 fun start_long_running_testsuite_monitor/1
             ]
     end,
@@ -347,12 +348,14 @@ ensure_make_cmd(Config) ->
                     "please set MAKE or 'make_cmd' in ct config"}
     end.
 
-ensure_fake_make_cmd(Config) ->
+ensure_rabbitmq_run_cmd(Config) ->
     case os:getenv("RABBITMQ_RUN") of
         false ->
-            {skip, "Bazel build env required"};
+            {skip,
+             "Bazel helper rabbitmq-run required, " ++
+             "please set RABBITMQ_RUN"};
         P ->
-            set_config(Config, {make_cmd, P})
+            set_config(Config, {rabbitmq_run_cmd, P})
     end.
 
 ensure_erl_call_cmd(Config) ->

tools/tls-certs/BUILD.bazel

@@ -0,0 +1,4 @@
+exports_files([
+    "Makefile",
+    "openssl.cnf.in",
+])