root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Improve finding of the location of the secondary umbrella 

in integration tests
This commit is contained in:
Rin Kuryloski 2023-01-04 10:46:51 +01:00
parent 2cd020a0da
commit 1316f255d9
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rabbitmq.bzl
View File

@ -279,13 +279,7 @@ def rabbitmq_integration_suite(
"RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmqctl".format(package), "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmqctl".format(package),
"RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-plugins".format(package), "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-plugins".format(package),
"RABBITMQ_QUEUES": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-queues".format(package), "RABBITMQ_QUEUES": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-queues".format(package),
"RABBITMQ_RUN_SECONDARY": "$(location @rabbitmq-server-generic-unix-3.11//:rabbitmq-run)",
# The following variations were observed on different
# versions of bazel and in different environments:
# - _main~secondary_umbrella~rabbitmq-server-generic-unix-3.11
# - @~secondary_umbrella~rabbitmq-server-generic-unix-3.11
# - .secondary_umbrella.rabbitmq-server-generic-unix-3.11
"RABBITMQ_RUN_SECONDARY": "$(ls $TEST_SRCDIR/*secondary_umbrella*rabbitmq-server-generic-unix-3.11/rabbitmq-run)",
"LANG": "C.UTF-8", "LANG": "C.UTF-8",
}.items() + test_env.items()), }.items() + test_env.items()),
tools = [ tools = [