Update makefiles/bazel to reflect CT helpers repo merge-in

WORKSPACE.bazel

@@ -43,24 +43,6 @@ load("//:workspace_helpers.bzl", "rabbitmq_external_deps")
 
 rabbitmq_external_deps(rabbitmq_workspace = "@")
 
-git_repository(
-    name = "rabbitmq_ct_helpers",
-    commit = "f709a6f6a2345d3ab5076469cb8d8e42e89b2b59",
-    remote = "https://github.com/rabbitmq/rabbitmq-ct-helpers.git",
-    repo_mapping = {
-        "@rabbitmq-server": "@",
-    },
-)
-
-git_repository(
-    name = "rabbitmq_ct_client_helpers",
-    commit = "51ed1e59d725816cd82a3bd6211c043d385f180e",
-    remote = "https://github.com/rabbitmq/rabbitmq-ct-client-helpers.git",
-    repo_mapping = {
-        "@rabbitmq-server": "@",
-    },
-)
-
 load("//deps/amqp10_client:activemq.bzl", "activemq_archive")
 
 activemq_archive()

deps/rabbit/BUILD.bazel

@@ -242,7 +242,7 @@ rabbitmq_home(
     testonly = True,
     plugins = [
         ":test_bazel_erlang_lib",
-        "@rabbitmq_ct_client_helpers//:bazel_erlang_lib",
+        "//deps/rabbitmq_ct_client_helpers:bazel_erlang_lib",
         "@inet_tcp_proxy//:bazel_erlang_lib",
         "@meck//:bazel_erlang_lib",
     ],
@@ -915,7 +915,7 @@ suites = [
         size = "small",
         runtime_deps = [
             "@meck//:bazel_erlang_lib",
-            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_helpers:bazel_erlang_lib",
         ],
     ),
     rabbitmq_integration_suite(

deps/rabbitmq_auth_backend_cache/BUILD.bazel

@@ -70,7 +70,7 @@ suites = [
     rabbitmq_suite(
         name = "rabbit_auth_cache_SUITE",
         runtime_deps = [
-            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_helpers:bazel_erlang_lib",
         ],
     ),
 ]

deps/rabbitmq_ct_client_helpers/.github/workflows/build.yaml

@@ -1,31 +0,0 @@
-name: Build
-on: push
-jobs:
-  test:
-    name: build
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-        erlang_version:
-        - "23.2"
-    timeout-minutes: 10
-    steps:
-    - name: CHECKOUT REPOSITORY
-      uses: actions/checkout@v2
-    - name: CONFIGURE OTP & ELIXIR
-      uses: actions/setup-elixir@v1
-      with:
-        otp-version: ${{ matrix.erlang_version }}
-        elixir-version: 1.10.4
-    - name: CONFIGURE BAZEL
-      run: |
-        ERLANG_HOME="$(dirname $(dirname $(which erl)))"
-        cat << EOF >> .bazelrc
-          build --@bazel-erlang//:erlang_version=${{ matrix.erlang_version }}
-          build --@bazel-erlang//:erlang_home=${ERLANG_HOME}
-        EOF
-    #! - name: Setup tmate session
-    #!   uses: mxschmitt/action-tmate@v3
-    - name: BUILD
-      run: |
-        bazelisk build :bazel_erlang_lib

deps/rabbitmq_ct_client_helpers/BUILD.bazel

@@ -4,8 +4,8 @@ erlang_lib(
     app_name = "rabbitmq_ct_client_helpers",
     app_version = "master",
     deps = [
-        "@rabbitmq-server//deps/amqp_client:bazel_erlang_lib",
+        "//deps/amqp_client:bazel_erlang_lib",
-        "@rabbitmq-server//deps/rabbit_common:bazel_erlang_lib",
+        "//deps/rabbit_common:bazel_erlang_lib",
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+        "//deps/rabbitmq_ct_helpers:bazel_erlang_lib",
     ],
 )

deps/rabbitmq_ct_helpers/.github/workflows/build.yaml

@@ -1,31 +0,0 @@
-name: Build
-on: push
-jobs:
-  test:
-    name: build
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-        erlang_version:
-        - "23.2"
-    timeout-minutes: 10
-    steps:
-    - name: CHECKOUT REPOSITORY
-      uses: actions/checkout@v2
-    - name: CONFIGURE OTP & ELIXIR
-      uses: actions/setup-elixir@v1
-      with:
-        otp-version: ${{ matrix.erlang_version }}
-        elixir-version: 1.10.4
-    - name: CONFIGURE BAZEL
-      run: |
-        ERLANG_HOME="$(dirname $(dirname $(which erl)))"
-        cat << EOF >> .bazelrc
-          build --@bazel-erlang//:erlang_version=${{ matrix.erlang_version }}
-          build --@bazel-erlang//:erlang_home=${ERLANG_HOME}
-        EOF
-    #! - name: Setup tmate session
-    #!   uses: mxschmitt/action-tmate@v3
-    - name: BUILD
-      run: |
-        bazelisk build :bazel_erlang_lib

deps/rabbitmq_ct_helpers/BUILD.bazel

@@ -5,6 +5,6 @@ erlang_lib(
     app_version = "master",
     deps = [
         "@proper//:bazel_erlang_lib",
-        "@rabbitmq-server//deps/rabbit_common:bazel_erlang_lib",
+        "//deps/rabbit_common:bazel_erlang_lib",
     ],
 )

deps/rabbitmq_event_exchange/BUILD.bazel

@@ -49,7 +49,7 @@ suites = [
     rabbitmq_suite(
         name = "unit_SUITE",
         runtime_deps = [
-            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_helpers:bazel_erlang_lib",
         ],
     ),
 ]

deps/rabbitmq_management/BUILD.bazel

@@ -94,7 +94,7 @@ suites = [
         name = "cache_SUITE",
         size = "small",
         runtime_deps = [
-            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_helpers:bazel_erlang_lib",
         ],
         deps = [
             "@proper//:bazel_erlang_lib",
@@ -157,7 +157,7 @@ suites = [
         name = "rabbit_mgmt_stats_SUITE",
         size = "small",
         runtime_deps = [
-            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_helpers:bazel_erlang_lib",
         ],
         deps = [
             "//deps/rabbitmq_management_agent:bazel_erlang_lib",

deps/rabbitmq_management_agent/BUILD.bazel

@@ -97,7 +97,7 @@ suites = [
         name = "rabbit_mgmt_slide_SUITE",
         size = "small",
         runtime_deps = [
-            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_helpers:bazel_erlang_lib",
         ],
         deps = [
             "@proper//:bazel_erlang_lib",

deps/rabbitmq_peer_discovery_aws/BUILD.bazel

@@ -76,7 +76,7 @@ suites = [
             "external",
         ],
         deps = [
-            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_helpers:bazel_erlang_lib",
         ],
     ),
     rabbitmq_suite(

rabbitmq-components.mk

@@ -54,8 +54,8 @@ dep_rabbitmq_boot_steps_visualiser    = git_rmq           rabbitmq-boot-steps-vi
 dep_rabbitmq_cli                      = git_rmq-subfolder rabbitmq-cli $(current_rmq_ref) $(base_rmq_ref) master
 dep_rabbitmq_codegen                  = git_rmq-subfolder rabbitmq-codegen $(current_rmq_ref) $(base_rmq_ref) master
 dep_rabbitmq_consistent_hash_exchange = git_rmq-subfolder rabbitmq-consistent-hash-exchange $(current_rmq_ref) $(base_rmq_ref) master
-dep_rabbitmq_ct_client_helpers        = git_rmq           rabbitmq-ct-client-helpers $(current_rmq_ref) $(base_rmq_ref) master
+dep_rabbitmq_ct_client_helpers        = git_rmq-subfolder rabbitmq-ct-client-helpers $(current_rmq_ref) $(base_rmq_ref) master
-dep_rabbitmq_ct_helpers               = git_rmq           rabbitmq-ct-helpers $(current_rmq_ref) $(base_rmq_ref) master
+dep_rabbitmq_ct_helpers               = git_rmq-subfolder rabbitmq-ct-helpers $(current_rmq_ref) $(base_rmq_ref) master
 dep_rabbitmq_delayed_message_exchange = git_rmq           rabbitmq-delayed-message-exchange $(current_rmq_ref) $(base_rmq_ref) master
 dep_rabbitmq_dotnet_client            = git_rmq           rabbitmq-dotnet-client $(current_rmq_ref) $(base_rmq_ref) master
 dep_rabbitmq_event_exchange           = git_rmq-subfolder rabbitmq-event-exchange $(current_rmq_ref) $(base_rmq_ref) master

rabbitmq.bzl

@@ -129,8 +129,8 @@ def rabbitmq_integration_suite(
         additional_hdrs = additional_hdrs,
         additional_srcs = additional_srcs,
         data = [
-            "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
+            "//deps/rabbitmq_ct_helpers/tools/tls-certs:Makefile",
-            "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
+            "//deps/rabbitmq_ct_helpers/tools/tls-certs:openssl.cnf.in",
         ] + data,
         test_env = dict({
             "SKIP_MAKE_TEST_DIST": "true",
@@ -146,12 +146,12 @@ def rabbitmq_integration_suite(
         runtime_deps = [
             "//deps/rabbitmq_cli:elixir_as_bazel_erlang_lib",
             "//deps/rabbitmq_cli:rabbitmqctl",
-            "@rabbitmq_ct_client_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_client_helpers:bazel_erlang_lib",
         ] + runtime_deps,
         deps = [
             "//deps/amqp_client:bazel_erlang_lib",
             "//deps/rabbit_common:bazel_erlang_lib",
-            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_helpers:bazel_erlang_lib",
         ] + deps,
         **kwargs
     )
@@ -161,8 +161,8 @@ def rabbitmq_integration_suite(
         suite_name = name,
         tags = tags + ["mixed-version-cluster"],
         data = [
-            "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
+            "//deps/rabbitmq_ct_helpers/tools/tls-certs:Makefile",
-            "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
+            "//deps/rabbitmq_ct_helpers/tools/tls-certs:openssl.cnf.in",
         ] + data,
         test_env = dict({
             "SKIP_MAKE_TEST_DIST": "true",
@@ -180,12 +180,12 @@ def rabbitmq_integration_suite(
         runtime_deps = [
             "//deps/rabbitmq_cli:elixir_as_bazel_erlang_lib",
             "//deps/rabbitmq_cli:rabbitmqctl",
-            "@rabbitmq_ct_client_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_client_helpers:bazel_erlang_lib",
         ] + runtime_deps,
         deps = [
             "//deps/amqp_client:bazel_erlang_lib",
             "//deps/rabbit_common:bazel_erlang_lib",
-            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+            "//deps/rabbitmq_ct_helpers:bazel_erlang_lib",
         ] + deps,
         **kwargs
     )