Skip to content

Commit d9b8194

Browse files
lukebakkenlukebakken
committed
Enable testing with a Khepri-enabled cluster
* Enable log checking for Ubuntu GHA * Be sure to get cluster logs on failure
1 parent 089354b commit d9b8194

26 files changed

+492
-62
lines changed

‎.ci/ubuntu/cluster/docker-compose.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
networks:
2+
rabbitnet:
3+
name: rabbitnet
4+
driver: bridge
5+
6+
services:
7+
rmq0:
8+
build: rmq
9+
hostname: rmq0
10+
networks:
11+
rabbitnet:
12+
aliases:
13+
- rmq0.local
14+
ports:
15+
# HOST:CONTAINER
16+
- 15672:15672
17+
- 5672:5672
18+
- 5671:5671
19+
rmq1:
20+
build: rmq
21+
hostname: rmq1
22+
networks:
23+
rabbitnet:
24+
aliases:
25+
- rmq1.local
26+
ports:
27+
- 15673:15672
28+
- 5673:5672
29+
- 5681:5671
30+
rmq2:
31+
build: rmq
32+
hostname: rmq2
33+
networks:
34+
rabbitnet:
35+
aliases:
36+
- rmq2.local
37+
ports:
38+
- 15674:15672
39+
- 5674:5672
40+
- 5691:5671

‎.ci/ubuntu/cluster/gha-logs.sh

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/bin/bash
2+
3+
set -o errexit
4+
set -o pipefail
5+
set -o xtrace
6+
7+
readonly arg1="${1:-undefined}"
8+
9+
function now
10+
{
11+
date '+%Y%m%d-%H%M%S'
12+
}
13+
14+
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
15+
readonly script_dir
16+
readonly log_dir="$script_dir/log"
17+
echo "$(now) [INFO] log_dir: '$log_dir'"
18+
19+
function run_docker_compose
20+
{
21+
# shellcheck disable=SC2068
22+
docker compose --file "$script_dir/docker-compose.yml" $@
23+
}
24+
25+
set -o nounset
26+
27+
run_docker_compose logs rmq0 > "$log_dir/rmq0.log"
28+
run_docker_compose logs rmq1 > "$log_dir/rmq1.log"
29+
run_docker_compose logs rmq2 > "$log_dir/rmq2.log"
30+
31+
if [[ $arg1 == 'check' ]]
32+
then
33+
if grep -iF inet_error "$log_dir"/*
34+
then
35+
echo '[ERROR] found inet_error in RabbitMQ logs' 1>&2
36+
exit 1
37+
fi
38+
fi

‎.ci/ubuntu/cluster/gha-setup.sh

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
#!/usr/bin/env bash
2+
3+
set -o errexit
4+
set -o pipefail
5+
set -o xtrace
6+
7+
function now
8+
{
9+
date '+%Y%m%d-%H%M%S'
10+
}
11+
12+
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
13+
readonly script_dir
14+
echo "$(now) [INFO] script_dir: '$script_dir'"
15+
16+
function run_docker_compose
17+
{
18+
# shellcheck disable=SC2068
19+
docker compose --file "$script_dir/docker-compose.yml" $@
20+
}
21+
22+
if [[ $2 == 'arm' ]]
23+
then
24+
readonly rabbitmq_image="${RABBITMQ_IMAGE:-pivotalrabbitmq/rabbitmq-arm64:main}"
25+
else
26+
readonly rabbitmq_image="${RABBITMQ_IMAGE:-pivotalrabbitmq/rabbitmq:main}"
27+
fi
28+
29+
if [[ ! -v GITHUB_ACTIONS ]]
30+
then
31+
GITHUB_ACTIONS='false'
32+
fi
33+
34+
if [[ -d $GITHUB_WORKSPACE ]]
35+
then
36+
echo "$(now) [INFO] GITHUB_WORKSPACE is set: '$GITHUB_WORKSPACE'"
37+
else
38+
GITHUB_WORKSPACE="$(cd "$script_dir/../../.." && pwd)"
39+
echo "$(now) [INFO] set GITHUB_WORKSPACE to: '$GITHUB_WORKSPACE'"
40+
fi
41+
42+
if [[ $1 == 'pull' ]]
43+
then
44+
readonly docker_fresh='true'
45+
else
46+
readonly docker_fresh='false'
47+
fi
48+
49+
if [[ $1 == 'stop' ]]
50+
then
51+
run_docker_compose down
52+
exit 0
53+
fi
54+
55+
set -o nounset
56+
57+
function start_rabbitmq
58+
{
59+
echo "$(now) [INFO] starting RabbitMQ cluster via docker compose"
60+
if [[ $docker_fresh == 'true' ]]
61+
then
62+
run_docker_compose build --no-cache --pull --build-arg "RABBITMQ_DOCKER_TAG=$rabbitmq_image"
63+
run_docker_compose up --pull always --detach
64+
else
65+
run_docker_compose build --build-arg "RABBITMQ_DOCKER_TAG=$rabbitmq_image"
66+
run_docker_compose up --detach
67+
fi
68+
}
69+
70+
function wait_rabbitmq
71+
{
72+
set +o errexit
73+
declare -i count=60
74+
echo "$(now) [INFO] waiting for rmq0 container to come up..."
75+
while (( count > 0)) && ! run_docker_compose exec rmq0 rabbitmqctl await_startup >/dev/null 2>&1
76+
do
77+
sleep 1
78+
echo "$(now) [INFO] still waiting for rmq0 container to come up..."
79+
(( count-- ))
80+
done
81+
set -o errexit
82+
83+
echo "$(now) [INFO] rmq0 container and RabbitMQ are up"
84+
85+
run_docker_compose exec rmq1 rabbitmqctl await_startup
86+
echo "$(now) [INFO] rmq1 container and RabbitMQ are up"
87+
88+
run_docker_compose exec rmq2 rabbitmqctl await_startup
89+
echo "$(now) [INFO] rmq2 container and RabbitMQ are up"
90+
91+
run_docker_compose exec rmq0 rabbitmqctl enable_feature_flag all
92+
run_docker_compose exec rmq0 rabbitmq-diagnostics erlang_version
93+
run_docker_compose exec rmq0 rabbitmqctl version
94+
}
95+
96+
function install_ca_certificate
97+
{
98+
set +o errexit
99+
hostname
100+
hostname -s
101+
hostname -f
102+
openssl version
103+
openssl version -d
104+
set -o errexit
105+
106+
if [[ $GITHUB_ACTIONS == 'true' ]]
107+
then
108+
readonly openssl_store_dir='/usr/lib/ssl/certs'
109+
sudo cp -vf "$GITHUB_WORKSPACE/.ci/certs/ca_certificate.pem" "$openssl_store_dir"
110+
sudo ln -vsf "$openssl_store_dir/ca_certificate.pem" "$openssl_store_dir/$(openssl x509 -hash -noout -in $openssl_store_dir/ca_certificate.pem).0"
111+
else
112+
echo "[WARNING] you must install '$GITHUB_WORKSPACE/.ci/certs/ca_certificate.pem' manually into your trusted root store"
113+
fi
114+
115+
for PORT in 5671 5681 5691
116+
do
117+
openssl s_client -connect "localhost:$PORT" \
118+
-CAfile "$GITHUB_WORKSPACE/.ci/certs/ca_certificate.pem" \
119+
-cert "$GITHUB_WORKSPACE/.ci/certs/client_localhost_certificate.pem" \
120+
-key "$GITHUB_WORKSPACE/.ci/certs/client_localhost_key.pem" \
121+
-pass pass:grapefruit < /dev/null
122+
done
123+
}
124+
125+
start_rabbitmq
126+
127+
wait_rabbitmq
128+
129+
install_ca_certificate

‎.ci/ubuntu/cluster/log/.gitkeep

Whitespace-only changes.

‎.ci/ubuntu/cluster/rmq/Dockerfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARG RABBITMQ_DOCKER_TAG=pivotalrabbitmq/rabbitmq:main
2+
3+
FROM ${RABBITMQ_DOCKER_TAG}
4+
5+
ENV RABBITMQ_FEATURE_FLAGS=khepri_db
6+
7+
COPY --chown=rabbitmq:rabbitmq --chmod=0400 erlang.cookie /var/lib/rabbitmq/.erlang.cookie
8+
COPY --chown=rabbitmq:rabbitmq --chmod=0400 ca_certificate.pem /etc/rabbitmq/ca_certificate.pem
9+
COPY --chown=rabbitmq:rabbitmq --chmod=0400 server_localhost_certificate.pem /etc/rabbitmq/server_localhost_certificate.pem
10+
COPY --chown=rabbitmq:rabbitmq --chmod=0400 server_localhost_key.pem /etc/rabbitmq/server_localhost_key.pem
11+
COPY --chown=rabbitmq:rabbitmq --chmod=0644 enabled_plugins /etc/rabbitmq/enabled_plugins
12+
COPY --chown=rabbitmq:rabbitmq rabbitmq-env.conf /etc/rabbitmq/rabbitmq-env.conf
13+
COPY --chown=rabbitmq:rabbitmq rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
14+
COPY --chown=rabbitmq:rabbitmq advanced.config /etc/rabbitmq/advanced.config
15+
16+
EXPOSE 4369 5671 5672 15672 15692 25672 35672-35682

‎.ci/ubuntu/cluster/rmq/advanced.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[
2+
{kernel, [{net_ticktime, 15}]}
3+
].

‎.ci/ubuntu/cluster/rmq/ca_certificate.pem

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDhjCCAm6gAwIBAgIUJ2lTbiccSFtA9+8eGPQD5yGJ7w8wDQYJKoZIhvcNAQEL
3+
BQAwTDE7MDkGA1UEAwwyVExTR2VuU2VsZlNpZ25lZHRSb290Q0EgMjAyMy0xMC0w
4+
OFQwODoxNjowMy41OTA0NTQxDTALBgNVBAcMBCQkJCQwHhcNMjMxMDA4MTUxNjAz
5+
WhcNMzMxMDA1MTUxNjAzWjBMMTswOQYDVQQDDDJUTFNHZW5TZWxmU2lnbmVkdFJv
6+
b3RDQSAyMDIzLTEwLTA4VDA4OjE2OjAzLjU5MDQ1NDENMAsGA1UEBwwEJCQkJDCC
7+
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdiiGj37094gAHfVpbIQHfu
8+
ccBVozpexrYjDCbjw4IyJJOajJRNGbYZwEt3Jt5NaDc+zyoBZpKaZWDEjOxbNYkd
9+
MtIHyFW4V4ooA6pySR9pzMI91dXoCkzL9Ex23Zrj0KF70qBQuPTbF5bnAbMELFuv
10+
quFnfMw2ALsFrWh2DOwnMlt1hbdj6Iapl2yRGhVSgsr72SK+67b+b7WH02VGDrfm
11+
Y3qqx3xAI6woKSE2Ot14Csak/iR1xit68X5GhzvSdOos0Yo3I4v8mlFEO+kpKWB0
12+
7y3Hb5AU/hqvSOwLRA+CV09bxN4N5rOfFHkPVuVMXQzX9mLCxzxroZn/sQzkrtMC
13+
AwEAAaNgMF4wDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
14+
FNSsn21DVr1XhhqmU+wMnLWFZc55MB8GA1UdIwQYMBaAFNSsn21DVr1XhhqmU+wM
15+
nLWFZc55MA0GCSqGSIb3DQEBCwUAA4IBAQDRc1mAERvR1VPOaMevcB2pGaQfRLkN
16+
fYgiO7rxd77FIQLieCbNNZ6z/fDRkBjgZ9xzAWl0vFJ0xZ0FSdUtAXEa9ES7r7eq
17+
XOSW/5CRPeib4nMDeQvTSiCx5QqlIz4oUwW9bbpPcBQXM0IVZwo1Jbye/BGrjAmQ
18+
Z3a5ph0f85Shjy2Yt9JB9BDCWOK8EU294CiKMUvdtQwSaQpl8GQfmvzWKAL4encu
19+
ryEAPTDT9zuQi2bOCDY5QMwVNS6mDAsqbvMjOaHD/Cdzl26rgv+8QLVNDUvGfGtD
20+
58bWugHyxCdnDToCtIEaJaoi7izKd0bILbuQXS7oKfryJpHwO+9U8ZjT
21+
-----END CERTIFICATE-----

‎.ci/ubuntu/cluster/rmq/enabled_plugins

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[rabbitmq_auth_mechanism_ssl,rabbitmq_management,rabbitmq_top].

‎.ci/ubuntu/cluster/rmq/erlang.cookie

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
COOKIE

‎.ci/ubuntu/cluster/rmq/rabbitmq-env.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# LOG=debug
2+
USE_LONGNAME=true
3+
NODENAME="rabbit@$(hostname).local"

‎.ci/ubuntu/cluster/rmq/rabbitmq.conf

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
loopback_users = none
2+
loopback_users.guest = true
3+
4+
log.console = true
5+
log.console.level = debug
6+
log.file = false
7+
log.exchange = false
8+
9+
listeners.tcp.default = 5672
10+
listeners.ssl.default = 5671
11+
reverse_dns_lookups = false
12+
13+
deprecated_features.permit.amqp_address_v1 = false
14+
15+
ssl_options.cacertfile = /etc/rabbitmq/ca_certificate.pem
16+
ssl_options.certfile = /etc/rabbitmq/server_localhost_certificate.pem
17+
ssl_options.keyfile = /etc/rabbitmq/server_localhost_key.pem
18+
ssl_options.verify = verify_peer
19+
ssl_options.password = grapefruit
20+
ssl_options.depth = 1
21+
ssl_options.fail_if_no_peer_cert = false
22+
23+
auth_mechanisms.1 = PLAIN
24+
auth_mechanisms.2 = ANONYMOUS
25+
auth_mechanisms.3 = EXTERNAL
26+
27+
cluster_formation.peer_discovery_backend = classic_config
28+
cluster_formation.classic_config.nodes.0 = [email protected]
29+
cluster_formation.classic_config.nodes.1 = [email protected]
30+
cluster_formation.classic_config.nodes.2 = [email protected]

‎.ci/ubuntu/cluster/rmq/server_localhost_certificate.pem

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDvDCCAqSgAwIBAgIBATANBgkqhkiG9w0BAQsFADBMMTswOQYDVQQDDDJUTFNH
3+
ZW5TZWxmU2lnbmVkdFJvb3RDQSAyMDIzLTEwLTA4VDA4OjE2OjAzLjU5MDQ1NDEN
4+
MAsGA1UEBwwEJCQkJDAeFw0yMzEwMDgxNTE2MDNaFw0zMzEwMDUxNTE2MDNaMCUx
5+
EjAQBgNVBAMMCWxvY2FsaG9zdDEPMA0GA1UECgwGc2VydmVyMIIBIjANBgkqhkiG
6+
9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2dxp0wR++oE89W/mhEL7/XfJfo8iDbKKciUP
7+
PyIgBvggv625HifmEJG+epl77KinbCuZdc0DX/2FKH6HPM/tC6VcWB2cZRSHpBSM
8+
aieRV4yiaUFTqlOgQalJyRczRtv35QPdaIcDOX4lOw887sn6sJuZY5FtAyDr3opA
9+
gZWLR+6fqi0YWqp5wqaz3hMzTGEEuu/ZKSqMWURRvp+Voz13auiShvhRb9hsdRp0
10+
zf12Y9wGhWjOg7G6v1r/BP6/Nr1gWrgNUhuomSFC1FCRdCr1VrLpUfG3VNloVEOG
11+
mbWYfo+cDN6fV+PDlVB5UQp9YciFfpGXBzSXgNcsk8fEXpg8IQIDAQABo4HPMIHM
12+
MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMCoG
13+
A1UdEQQjMCGCCWxvY2FsaG9zdIIJUFJPS09GSUVWgglsb2NhbGhvc3QwHQYDVR0O
14+
BBYEFPezEEGf7j3HedbaRCh4/FHT2VXrMB8GA1UdIwQYMBaAFNSsn21DVr1Xhhqm
15+
U+wMnLWFZc55MDEGA1UdHwQqMCgwJqAkoCKGIGh0dHA6Ly9jcmwtc2VydmVyOjgw
16+
MDAvYmFzaWMuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQBLeagmroj4FFOXgUqDQo7i
17+
kGCBZuCmn6GnCYdwEHtMoysGZ3vNFsB1BCug4fTuL7OU1l+Xw8iVnIvnGBpKypmt
18+
b7h9dN6urty0ewCS4WO8BTZUIdc1RJMo9N+nEMTja+5cqXHtO/VQnO2eqeALWJUU
19+
IDPycb6HcTkHGFX0QDwxsPuMFL3p5HGr6U0llLF0J5FedxUA/YLLVCStofrWvBGT
20+
PKngh7S6ntaIUnTvwyzY2kPJ+byqRDNrL5jdavw1U8cGh1vi3k9mf1Uloi0mnAMT
21+
kqOPzbQmHIQjxIOwqp2xkObXgqz1b0KNDfRDTwp90wzVxOCF5JJBCAIjPyLuncDv
22+
-----END CERTIFICATE-----

‎.ci/ubuntu/cluster/rmq/server_localhost_key.pem

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
-----BEGIN ENCRYPTED PRIVATE KEY-----
2+
MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQILovSnFfKBhECAggA
3+
MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBBmLCdyyKqcbbjoi1/8A+rxBIIE
4+
0Mmi72DP32seewlELsG4gVkOH6Gwvs5iAqHYap1yOps3mfI1TtuMhDEZDH2Sj+MB
5+
J1E35WEzJGGxTVhvK/J+R/1fUfd44Acgl1Ks1IINJyre4+vYfDUyWB5O2lS+9mr7
6+
L6q7kfAbBB2OuAEuGL5GMlTRetyASXbspWbi0M+vA9R+NemYbRzFpozP/fedFpQY
7+
6r/QnogSwuRcE1VMghUjZwzZWyG2HFMFp5emiAHRVi+SxLpIIv6wwV8SB4jDMO46
8+
CsyxLjkjhd2GmkMRpmIxXw7eXbWa/bnf/KhJG7gSDBgmGuoBJ4cDnQc2jFN8UqXW
9+
IG3+K6PIeGTT/t4aC6YSq+kb8R3rTfVbPdq51Uo55uMatpJg8AatsysL900nNfuz
10+
MejikInTz4+m6jY5kzEm+fToRNHXhcmnQeD6SYc8PNi/4QfxiMcHcI91GRNQ2nFI
11+
Xd5a1CG4f78WGUmK9PylxBdh+1nx9yQyrZKWcShuLkOQk4UAL0w31B70/l9jVoiN
12+
gcN4w18TUfYLIg8Ab6lL6wXipBrr1AjB/Dn2oCpMTiMolyWcsPAHDtxvrsgbsXRr
13+
vxd/vNo+RpSsvjq2wnXhxe+qC/uHBzJeyfx0m+rs6vBKPZvS7uTBfYGG+RhVJvb5
14+
W2RRfprvTzgBbbKBCTJ5ry4SMZX7ci008f7oVqKLAlsApA58dDgZ+ORF4TxtdSkJ
15+
u3r2htUBvC+mzYMYU4D+sYQ7S9qqVhKe7hvNzLW5UhkEhH57SQ1dIcstTsTYUDC7
16+
1o/zOkpVxByudKEGwgEtyYM+DD/YoGLGB/4qPULnHFOBwxWdK6Ov9I0ezuhe/nOA
17+
ERe3ixLklwHRI5sM/gt57A7MiMPhFHDpqt/xO/m/uCX2VRDW/IAKXpIfxuuxDcIz
18+
MLLxJhYCrGRHMStmBAPy3zmmhpn+wHTkwVbEVRMsh+o8M2vPelrysUtUlarRBQI+
19+
l5tY/UCgX0bGUvHKIp5z8GuRu/CTpjtpsyuNwtpq2TrgnmyiznyfFl4oknvEcfmF
20+
BLUd23ZrTyn1ha8cnKXY9JSHgS2cxdU0QnkPT1BEypptf30nQ1lLqiUg9GLR+xC5
21+
EeHn/80gL/MrpVnWdEznJdWMzau39kqf3ajNQlUb/SX5YQaeUKYrWoLHI+UNhUG2
22+
5fr2vcBgk0gt7k5ZDpWejhEu0BDTf3xrE9dU2jj6hOw6E+Q5bI59QvnLYqCvqBmE
23+
asDMBafo+/Px8xnXazFr5b5FyNqeXzBRPgRw5wFmK5YdFXU0fIpuF9IJb1TwLITp
24+
Hk+Hn760AsT3ALzHgRzC2e6bUUO6F/iw/6s6awwRbEPpLYTHwb9Mv7efeVsGTYiM
25+
Fi0OHapnzzbb4ErVL+92mkOT8flDoLhbKHJCRbOvu4C9awRs5aVbkEsygV67tLwu
26+
SIgUMpdxOMYYquyCJ+WUbyv5VSyvhnUIj7u2kdH+zyAendAi4Rgx/5e4PcD62c+X
27+
tNKp4KrlpF3jGIaPODXZVE2aIrhI0njVlUjIQRs6OOMXleO6+xWQI/1fx/xn/oKm
28+
TBUOtW3Y7AzyojbPiScvjmT+aoVwAZ3juHnUuxEuyUcI3WokkWPpllcaGd95sCUG
29+
7iR90VPBJ/meYyQMYY1BGq4ngi5DvLGy6K/pS5CHPi0U
30+
-----END ENCRYPTED PRIVATE KEY-----

‎.ci/ubuntu/enabled_plugins renamed to ‎.ci/ubuntu/one-node/enabled_plugins

File renamed without changes.

‎.ci/ubuntu/gha-log-check.sh renamed to ‎.ci/ubuntu/one-node/gha-log-check.sh

File renamed without changes.

‎.ci/ubuntu/gha-setup.sh renamed to ‎.ci/ubuntu/one-node/gha-setup.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if [[ -d $GITHUB_WORKSPACE ]]
2828
then
2929
echo "[INFO] GITHUB_WORKSPACE is set: '$GITHUB_WORKSPACE'"
3030
else
31-
GITHUB_WORKSPACE="$(cd "$script_dir/../.." && pwd)"
31+
GITHUB_WORKSPACE="$(cd "$script_dir/../../.." && pwd)"
3232
echo "[INFO] set GITHUB_WORKSPACE to: '$GITHUB_WORKSPACE'"
3333
fi
3434

@@ -46,6 +46,9 @@ else
4646
readonly docker_pull_args=''
4747
fi
4848

49+
declare -r rabbitmq_docker_name="$docker_name_prefix-rabbitmq"
50+
declare -r toxiproxy_docker_name="$docker_name_prefix-toxiproxy"
51+
4952
if [[ $1 == 'stop' ]]
5053
then
5154
docker stop "$rabbitmq_docker_name"
@@ -55,9 +58,6 @@ fi
5558

5659
set -o nounset
5760

58-
declare -r rabbitmq_docker_name="$docker_name_prefix-rabbitmq"
59-
declare -r toxiproxy_docker_name="$docker_name_prefix-toxiproxy"
60-
6161
function start_toxiproxy
6262
{
6363
if [[ $run_toxiproxy == 'true' ]]
@@ -89,8 +89,8 @@ function start_rabbitmq
8989
--publish 5672:5672 \
9090
--publish 15672:15672 \
9191
--network "$docker_network_name" \
92-
--volume "$GITHUB_WORKSPACE/.ci/ubuntu/enabled_plugins:/etc/rabbitmq/enabled_plugins" \
93-
--volume "$GITHUB_WORKSPACE/.ci/ubuntu/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro" \
92+
--volume "$GITHUB_WORKSPACE/.ci/ubuntu/one-node/enabled_plugins:/etc/rabbitmq/enabled_plugins" \
93+
--volume "$GITHUB_WORKSPACE/.ci/ubuntu/one-node/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro" \
9494
--volume "$GITHUB_WORKSPACE/.ci/certs:/etc/rabbitmq/certs:ro" \
9595
--volume "$GITHUB_WORKSPACE/.ci/ubuntu/log:/var/log/rabbitmq" \
9696
"$rabbitmq_image"

‎.ci/ubuntu/rabbitmq.conf renamed to ‎.ci/ubuntu/one-node/rabbitmq.conf

File renamed without changes.

0 commit comments

Comments
 (0)