From 10616fb19a9d2bc36912af2a81fdf9debaf2214b Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Mon, 6 Dec 2021 11:37:30 +0100
Subject: [PATCH] Prepare tests for the Ironic combined service
In I51bf7226aea145dc7c8fd93d61caa233ca16c9c9 we are introducing a way to
run Ironic API and conductor in one process. In the Bifrost change
I9faecfe6ece6d3c35396e3378c1e3930a487e130 we are switching Bifrost to
it, which breaks the Kolla job.
This change makes get_logs.sh aware of the new service. Also drop
RabbitMQ since Bifrost hasn't supported it for a while already.
Change-Id: I30ac6bd4332dacbdce1f5e25bd6a97d2982b208e
---
tests/get_logs.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tests/get_logs.sh b/tests/get_logs.sh
index 0c0e5a8be..a6e471cb4 100644
--- a/tests/get_logs.sh
+++ b/tests/get_logs.sh
@@ -93,12 +93,11 @@ copy_logs() {
# bifrost related logs
if [[ $(docker ps --filter name=bifrost_deploy --format "{{.Names}}") ]]; then
- for service in dnsmasq ironic-api ironic-conductor ironic-inspector mariadb nginx rabbitmq-server; do
+ for service in dnsmasq ironic ironic-api ironic-conductor ironic-inspector mariadb nginx; do
mkdir -p ${LOG_DIR}/kolla/$service
docker exec bifrost_deploy systemctl status $service > ${LOG_DIR}/kolla/$service/systemd-status-$service.txt
done
docker exec bifrost_deploy journalctl -u mariadb > ${LOG_DIR}/kolla/mariadb/mariadb.txt
- docker exec bifrost_deploy journalctl -u rabbitmq-server > ${LOG_DIR}/kolla/rabbitmq-server/rabbitmq.txt
fi
# haproxy related logs
--
GitLab