Adjustments for filesystem layout under bazel

Bazel doesn't assemble a unified deps dir in all cases, so we must be
more lenient in filter_ct_helpers_and_testsuites_paths

Author: HoloRin

src/rabbit_ct_broker_helpers.erl

@@ -1506,9 +1506,11 @@ filter_ct_helpers_and_testsuites_paths(CodePath) ->
               %% FIXME: This filtering is too naive. How to properly
               %% distinguish RabbitMQ-related applications from
               %% test-only modules?
-              ((ParentDirName =:= "rabbitmq_ct_helpers" andalso
+              (((ParentDirName =:= "rabbitmq_ct_helpers" orelse
+                 ParentDirName =:= "rabbitmq-ct-helpers") andalso
                 DirName =:= "ebin") orelse
-               (ParentDirName =:= "rabbitmq_ct_client_helpers" andalso
+               ((ParentDirName =:= "rabbitmq_ct_client_helpers" orelse
+                 ParentDirName =:= "rabbitmq-ct-client-helpers") andalso
                 DirName =:= "ebin") orelse
                (DirName =:= "test"))
       end, CodePath).

src/rabbit_ct_helpers.erl

@@ -91,6 +91,7 @@ run_setup_steps(Config, ExtraSteps) ->
             [
                 fun init_skip_as_error_flag/1,
                 % fun guess_tested_erlang_app_name/1,
+                fun ensure_secondary_umbrella/1,
                 fun ensure_rabbitmq_ct_helpers_srcdir/1,
                 fun ensure_make_cmd/1,
                 fun ensure_rabbitmq_run_cmd/1,