Skip to content

Commit 0c1359e

Browse files
committed
Fix container name
1 parent 4b0076d commit 0c1359e

File tree

4 files changed

+87
-5
lines changed

4 files changed

+87
-5
lines changed

.github/workflows/test-rabbitmq-alphas.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ jobs:
4343
run: make deps
4444
- name: Test with NIO
4545
run: |
46-
./mvnw verify -P use-nio -Drabbitmqctl.bin=DOCKER:rabbitmq \
46+
./mvnw verify -P use-nio -Drabbitmqctl.bin=DOCKER:rabbitmq0 \
4747
-Dtest-broker.A.nodename=rabbit@node0 -Dtest-broker.B.nodename=rabbit@node1 \
4848
-Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
4949
-Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
5050
-Dmaven.javadoc.skip=true \
5151
--no-transfer-progress
5252
- name: Test with blocking IO
5353
run: |
54-
./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq \
54+
./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq0 \
5555
-Dtest-broker.A.nodename=rabbit@node0 -Dtest-broker.B.nodename=rabbit@node1 \
5656
-Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
5757
-Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
--no-transfer-progress
5050
- name: Test with blocking IO
5151
run: |
52-
./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq \
52+
./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq0 \
5353
-Dtest-broker.A.nodename=rabbit@node0 -Dtest-broker.B.nodename=rabbit@node1 \
5454
-Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
5555
-Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \

ci/_start-cluster.sh

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
#!/usr/bin/env bash
2+
3+
LOCAL_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4+
5+
RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.0}
6+
7+
wait_for_message() {
8+
while ! docker logs "$1" | grep -q "$2";
9+
do
10+
sleep 5
11+
echo "Waiting 5 seconds for $1 to start..."
12+
done
13+
}
14+
15+
make -C "${PWD}"/tls-gen/basic
16+
17+
mv tls-gen/basic/result/server_$(hostname -s)_certificate.pem tls-gen/basic/result/server_certificate.pem
18+
mv tls-gen/basic/result/server_$(hostname -s)_key.pem tls-gen/basic/result/server_key.pem
19+
mv tls-gen/basic/server_$(hostname -s) tls-gen/basic/server
20+
mv tls-gen/basic/client_$(hostname -s) tls-gen/basic/client
21+
22+
rm -rf rabbitmq-configuration
23+
mkdir -p rabbitmq-configuration/tls
24+
25+
cp -R "${PWD}"/tls-gen/basic/* rabbitmq-configuration/tls
26+
chmod -R o+r rabbitmq-configuration/tls/*
27+
chmod -R g+r rabbitmq-configuration/tls/*
28+
./mvnw -q clean resources:testResources -Dtest-tls-certs.dir=/etc/rabbitmq/tls
29+
cp target/test-classes/rabbit@localhost.config rabbitmq-configuration/rabbit@localhost.config
30+
cp target/test-classes/hare@localhost.config rabbitmq-configuration/hare@localhost.config
31+
32+
echo "Running RabbitMQ ${RABBITMQ_IMAGE}"
33+
34+
docker rm -f rabbitmq 2>/dev/null || echo "rabbitmq was not running"
35+
docker run -d --name rabbitmq \
36+
--network host \
37+
-v "${PWD}"/rabbitmq-configuration:/etc/rabbitmq \
38+
--env RABBITMQ_CONFIG_FILE=/etc/rabbitmq/rabbit@localhost.config \
39+
--env RABBITMQ_NODENAME=rabbit@$(hostname) \
40+
--env RABBITMQ_NODE_PORT=5672 \
41+
--env RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie do-not-do-this-in-production" \
42+
"${RABBITMQ_IMAGE}"
43+
44+
# for CLI commands to share the same cookie
45+
docker exec rabbitmq bash -c "echo 'do-not-do-this-in-production' > /var/lib/rabbitmq/.erlang.cookie"
46+
docker exec rabbitmq chmod 0600 /var/lib/rabbitmq/.erlang.cookie
47+
48+
wait_for_message rabbitmq "completed with"
49+
50+
docker run -d --name hare \
51+
--network host \
52+
-v "${PWD}"/rabbitmq-configuration:/etc/rabbitmq \
53+
--env RABBITMQ_CONFIG_FILE=/etc/rabbitmq/hare@localhost.config \
54+
--env RABBITMQ_NODENAME=hare@$(hostname) \
55+
--env RABBITMQ_NODE_PORT=5673 \
56+
--env RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie do-not-do-this-in-production" \
57+
"${RABBITMQ_IMAGE}"
58+
59+
# for CLI commands to share the same cookie
60+
docker exec hare bash -c "echo 'do-not-do-this-in-production' > /var/lib/rabbitmq/.erlang.cookie"
61+
docker exec hare chmod 0600 /var/lib/rabbitmq/.erlang.cookie
62+
63+
wait_for_message hare "completed with"
64+
65+
docker exec hare rabbitmqctl --node hare@$(hostname) status
66+
67+
docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) is_running
68+
docker exec hare rabbitmq-diagnostics --node hare@$(hostname) is_running
69+
70+
docker exec hare rabbitmqctl --node hare@$(hostname) stop_app
71+
docker exec hare rabbitmqctl --node hare@$(hostname) join_cluster rabbit@$(hostname)
72+
docker exec hare rabbitmqctl --node hare@$(hostname) start_app
73+
74+
sleep 10
75+
76+
docker exec hare rabbitmqctl --node hare@$(hostname) await_startup
77+
78+
docker exec hare rabbitmqctl --node hare@$(hostname) enable_feature_flag --opt-in khepri_db
79+
docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) enable_feature_flag --opt-in khepri_db
80+
81+
docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) erlang_version
82+
docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) version
83+
docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) status
84+
docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) cluster_status

ci/start-cluster.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ mv rabbitmq-configuration/tls/server_$(hostname)_key.pem rabbitmq-configuration/
2323
chmod o+r rabbitmq-configuration/tls/*
2424
chmod g+r rabbitmq-configuration/tls/*
2525

26-
ls -al ci/cluster/configuration/tls/
27-
2826
docker compose --file ci/cluster/docker-compose.yml down
2927
docker compose --file ci/cluster/docker-compose.yml up --detach
3028

0 commit comments

Comments
 (0)