Do not build ibm mq docker image

Author: MarcialRosales

deps/amqp10_client/BUILD.bazel

@@ -17,7 +17,6 @@ load(
     "all_test_beam_files",
     "test_suite_beam_files",
 )
-load(":ibmmq.bzl", "IBMMQ_IMAGE_VERSION")
 
 APP_NAME = "amqp10_client"
 
@@ -121,14 +120,10 @@ rabbitmq_integration_suite(
         "test/mock_server.beam",
     ],
     data = [
-        "@activemq//:exec_dir",
-        "@ibmmq//:exec_dir",
+        "@activemq//:exec_dir",        
     ],
     test_env = {
-        "ACTIVEMQ": "$TEST_SRCDIR/$TEST_WORKSPACE/external/activemq/bin/activemq",
-        "IBMMQ_CMD" : "$TEST_SRCDIR/../test/system_SUITE_data/ibmmq/ibmmq",
-        "IBMMQ_SOURCE" : "$TEST_SRCDIR/$TEST_WORKSPACE/external/ibmmq",
-        "IBMMQ_IMAGE_TAG" : IBMMQ_IMAGE_VERSION,
+        "ACTIVEMQ": "$TEST_SRCDIR/$TEST_WORKSPACE/external/activemq/bin/activemq"        
     },
     deps = TEST_DEPS,
 )

deps/amqp10_client/Makefile

@@ -68,24 +68,6 @@ $(ACTIVEMQ): \
 test/system_SUITE_data/apache-activemq-$(ACTIVEMQ_VERSION)-bin.tar.gz:
 	$(gen_verbose) $(call core_http_get,$@,$(ACTIVEMQ_URL))
 
-IBMMQ_PRODUCT_VERSION := 9.3.5.1-r2
-IBMMQ_IMAGE_TAG := 9.3.5.1
-IBMMQ_URL := https://github.com/ibm-messaging/mq-container/archive/refs/tags/$(IBMMQ_PRODUCT_VERSION).tar.gz
+tests:: $(ACTIVEMQ) 
 
-IBMMQ := $(abspath test/system_SUITE_data/ibmmq/ibmmq)
-export IBMMQ
-
-$(IBMMQ): \
-  test/system_SUITE_data/ibmmq/$(IBMMQ_PRODUCT_VERSION).tar.gz
-	$(gen_verbose) tar -xf test/system_SUITE_data/ibmmq/$(IBMMQ_PRODUCT_VERSION).tar.gz \
-	 --strip-components=1 -C test/system_SUITE_data/ibmmq/
-	 $(gen_verbose) IBMMQ_SOURCE=test/system_SUITE_data/ibmmq/mq-container IMAGE_TAG=$(IBMMQ_IMAGE_TAG) \
-	 test/system_SUITE_data/ibmmq/ibmmq build
-
-
-test/system_SUITE_data/ibmmq/$(IBMMQ_PRODUCT_VERSION).tar.gz:
-	$(gen_verbose) $(call core_http_get,$@,$(IBMMQ_URL))
-
-tests:: $(ACTIVEMQ) $(IBMMQ)
-
-ct ct-system: $(ACTIVEMQ) $(IBMMQ)
+ct ct-system: $(ACTIVEMQ) 

deps/amqp10_client/ibmmq.bzl

@@ -11,14 +11,12 @@
 
 -export([setup_steps/0,
          teardown_steps/0,
-         ensure_ibmmq_docker_image/1,
          init_config/1,
          start_ibmmq_server/1,
          stop_ibmmq_server/1]).
 
 setup_steps() ->
-    [fun ensure_ibmmq_docker_image/1,
-     fun init_config/1,
+    [fun init_config/1,
      fun start_ibmmq_server/1
     ].
 
@@ -27,32 +25,6 @@ teardown_steps() ->
      fun stop_ibmmq_server/1
     ].
 
-ensure_ibmmq_docker_image(Config) ->
-    SourceImageTagTuple = case os:getenv("IBMMQ_SOURCE") of
-        false -> {skip, "IBMMQ_SOURCE env var not found"};
-        SOURCE ->
-            case os:getenv("IBMMQ_IMAGE_TAG") of
-                false -> {skip, "IBMMQ_IMAGE_TAG env var not found"};
-                TAG -> {SOURCE, TAG}
-            end
-    end,
-    IbmCmd = filename:join([?config(data_dir, Config), "ibmmq", "ibmmq"]),
-    case SourceImageTagTuple of
-        {skip, _} = Skip -> Skip;
-        {Source, ImageTag} ->
-            Env = [
-                {"IBMMQ_SOURCE", Source},
-                {"IBMMQ_IMAGE_TAG", ImageTag}
-            ],
-            Cmd = [IbmCmd, "build"],
-            ct:log("Building IBM Docker image using command ~p and env vars ~p", [Cmd, Env]),
-            case rabbit_ct_helpers:exec(Cmd, [{env, Env}]) of
-                {ok, _} -> rabbit_ct_helpers:set_config(Config, {ibmmq_cmd, IbmCmd});
-                Error       ->  ct:pal("Error: ~tp", [Error]),
-                            {skip, "Failed to run ibmmq/ibmmq"}
-            end
-    end.
-
 init_config(Config) ->
     NodeConfig = [{tcp_port_amqp, 5672}],
     rabbit_ct_helpers:set_config(Config, [ {rmq_nodes, [NodeConfig]},
@@ -61,7 +33,7 @@ init_config(Config) ->
                                             {sasl, {plain, <<"app">>, <<"passw0rd">>}} ]).
 
 start_ibmmq_server(Config) ->
-    IBMmqCmd = ?config(ibmmq_cmd, Config),
+    IBMmqCmd = filename:join([?config(data_dir, Config), "ibmmq_runner"]),
     Cmd = [IBMmqCmd, "start"],
     ct:log("Running command ~p", [Cmd]),
     case rabbit_ct_helpers:exec(Cmd, []) of
@@ -107,7 +79,7 @@ wait_for_ibmmq_port(Hostname, Port, Retries) ->
     end.
 
 stop_ibmmq_server(Config) ->
-    IBMmqCmd = ?config(ibmmq_cmd, Config),
+    IBMmqCmd = filename:join([?config(data_dir, Config), "ibmmq_runner"]),
     Cmd = [IBMmqCmd, "stop"],
     ct:log("Running command ~p", [Cmd]),
     case rabbit_ct_helpers:exec(Cmd, []) of

deps/amqp10_client/test/ibmmq_ct_helpers.erl

@@ -2,11 +2,11 @@
 
 SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# Requires: IBMMQ_SOURCE, IBMMQ_IMAGE_TAG
 set -u
 
-IMAGE=ibm-mqadvanced-server-dev
-TAG=`docker images --filter reference=$IMAGE | tail -1 | awk '{print $2}'`
+IMAGE=ibm-pivotalrabbitmq/ibm-mqadvanced-server-dev
+IMAGE_TAG=9.3.5.1-amd64
+TAG=`docker images --filter reference=$IMAGE | grep $IMAGE_TAG`
 
 kill_container_if_exist() {
   if docker stop $1 &> /dev/null; then
@@ -23,24 +23,7 @@ ensure_docker_image_exists() {
     echo "Docker image ${IMAGE}:${TAG} ready"
   fi
 }
-build_docker_image() {
-    echo "Building docker image. IBMMQ_SOURCE: ${IBMMQ_SOURCE} with IBMMQ_IMAGE_TAG: ${IBMMQ_IMAGE_TAG}"
-    READ_IMAGE_VERSION=`docker images --filter reference=$IMAGE | tail -1 | awk '{print $2}' | awk -F- '{print $1}'`
 
-    if [[ "$IBMMQ_IMAGE_TAG" == "$READ_IMAGE_VERSION" ]]
-    then
-        echo "Docker image ${IMAGE}:${IBMMQ_IMAGE_TAG} already built"
-        exit 0
-    fi
-    CUR_DIR=`pwd`
-    cat $SCRIPT/add-dev.mqsc.tpl > $IBMMQ_SOURCE/incubating/mqadvanced-server-dev/10-dev.mqsc.tpl
-    cd $IBMMQ_SOURCE
-    sed -i -e 's/genmqpkg_incamqp=0/genmqpkg_incamqp=1/g' Dockerfile-server
-    make build-devserver
-    TAG=`docker images --filter reference=$IMAGE | tail -1 | awk '{print $2}'`
-    cd $CUR_DIR
-    echo "Built image ${IMAGE}:${TAG}"
-}
 wait_for_message() {
   attemps_left=10
   while ! docker logs $1 2>&1 | grep -q "$2";