diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-04-06 16:15:53 +0200 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-04-06 16:15:53 +0200 |
| commit | 446eba8049196f7dfdd71d20be1fecdcbc30b097 (patch) | |
| tree | e3cf0bd7174bb2bd876d05d1b39d7a2a85556eb6 | |
| parent | c86f6c504b6916f23c1b7a67c8bf11a6010779b0 (diff) | |
| download | rabbitmq-server-git-446eba8049196f7dfdd71d20be1fecdcbc30b097.tar.gz | |
Fix bazel rbe for amqp10_client system_SUITE
| -rw-r--r-- | deps/amqp10_client/BUILD.bazel | 13 | ||||
| -rw-r--r-- | deps/amqp10_client/activemq.bzl | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/deps/amqp10_client/BUILD.bazel b/deps/amqp10_client/BUILD.bazel index 97dc20a05a..132d7b67cf 100644 --- a/deps/amqp10_client/BUILD.bazel +++ b/deps/amqp10_client/BUILD.bazel @@ -77,7 +77,7 @@ rabbitmq_run( ) ct_suite( - size = "large", + size = "medium", additional_hdrs = [ "src/amqp10_client.hrl", ], @@ -86,16 +86,21 @@ ct_suite( "test/mock_server.erl", ], data = [ - "@activemq//:bin_dir", + "@activemq//:exec_dir", "@rabbitmq_ct_helpers//tools/tls-certs:Makefile", "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in", ], erlc_opts = TEST_ERLC_OPTS + [ "-I deps/amqp10_client", ], + groups = [ + "rabbitmq", + "rabbitmq_strict", + "activemq", + "activemq_no_anon", + "mock", + ], suite_name = "system_SUITE", - # does not pass remotely. marking exclusive until we have logs from remote runs - tags = ["exclusive"], test_env = { "RABBITMQ_CT_SKIP_AS_ERROR": "true", "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/amqp10_client/rabbitmq-for-tests-run", diff --git a/deps/amqp10_client/activemq.bzl b/deps/amqp10_client/activemq.bzl index 7da4a4850e..7ad2f5cb4d 100644 --- a/deps/amqp10_client/activemq.bzl +++ b/deps/amqp10_client/activemq.bzl @@ -11,8 +11,8 @@ def activemq_archive(): sha256 = SHA_256, strip_prefix = "apache-activemq-{}".format(ACTIVEMQ_VERSION), build_file_content = """filegroup( - name = "bin_dir", - srcs = glob(["bin/**/*"]), + name = "exec_dir", + srcs = glob(["bin/**/*", "lib/**/*", "conf/**/*", "activemq-all-*.jar"]), visibility = ["//visibility:public"], ) """, |