From b9aa8b38f4cfa504b3068f596d42a8c69c09091a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Tue, 2 Jul 2019 20:44:33 +0200
Subject: [PATCH] CI: Keep stderr in ansible logs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Otherwise ara had only the stderr part and logs only the
stdout part which made ordered analysis harder.
Additionally add -vvv for the bootstrap-servers run.
Change-Id: Ia42ac9b90a17245e9df277c40bda24308ebcd11d
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
---
tests/deploy-bifrost.sh | 2 +-
tests/deploy.sh | 8 ++++----
tests/reconfigure.sh | 6 +++---
tests/upgrade-bifrost.sh | 2 +-
tests/upgrade.sh | 6 +++---
tools/setup_gate.sh | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/tests/deploy-bifrost.sh b/tests/deploy-bifrost.sh
index f45e40c4bb..86e3d15363 100755
--- a/tests/deploy-bifrost.sh
+++ b/tests/deploy-bifrost.sh
@@ -14,7 +14,7 @@ function deploy_bifrost {
# Deploy the bifrost container.
# TODO(mgoddard): add pull action when we have a local registry service in
# CI.
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy-bifrost > /tmp/logs/ansible/deploy-bifrost
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy-bifrost &> /tmp/logs/ansible/deploy-bifrost
}
diff --git a/tests/deploy.sh b/tests/deploy.sh
index 91e4a5f960..e72d7ad462 100755
--- a/tests/deploy.sh
+++ b/tests/deploy.sh
@@ -16,12 +16,12 @@ function deploy {
#TODO(inc0): Post-deploy complains that /etc/kolla is not writable. Probably we need to include become there
sudo chmod -R 777 /etc/kolla
# Actually do the deployment
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks > /tmp/logs/ansible/deploy-prechecks
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks &> /tmp/logs/ansible/deploy-prechecks
# TODO(jeffrey4l): add pull action when we have a local registry
# service in CI
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy > /tmp/logs/ansible/deploy
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv post-deploy > /tmp/logs/ansible/post-deploy
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv check > /tmp/logs/ansible/check-deploy
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy &> /tmp/logs/ansible/deploy
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv post-deploy &> /tmp/logs/ansible/post-deploy
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv check &> /tmp/logs/ansible/check-deploy
. /etc/kolla/admin-openrc.sh
# Wait for service ready
sleep 15
diff --git a/tests/reconfigure.sh b/tests/reconfigure.sh
index f8b2c04f40..db0854cff7 100755
--- a/tests/reconfigure.sh
+++ b/tests/reconfigure.sh
@@ -12,9 +12,9 @@ function reconfigure {
# TODO(jeffrey4l): make some configure file change and
# trigger a real reconfigure
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks > /tmp/logs/ansible/reconfigure-prechecks
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv reconfigure > /tmp/logs/ansible/reconfigure
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv check > /tmp/logs/ansible/check-reconfigure
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks &> /tmp/logs/ansible/reconfigure-prechecks
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv reconfigure &> /tmp/logs/ansible/reconfigure
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv check &> /tmp/logs/ansible/check-reconfigure
}
diff --git a/tests/upgrade-bifrost.sh b/tests/upgrade-bifrost.sh
index d6e9f5d248..72966166a4 100755
--- a/tests/upgrade-bifrost.sh
+++ b/tests/upgrade-bifrost.sh
@@ -15,7 +15,7 @@ function upgrade_bifrost {
# CI.
# TODO(mgoddard): make some configuration file changes and trigger a real
# upgrade.
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy-bifrost > /tmp/logs/ansible/upgrade-bifrost
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy-bifrost &> /tmp/logs/ansible/upgrade-bifrost
}
diff --git a/tests/upgrade.sh b/tests/upgrade.sh
index d3ebba63d1..898787e707 100755
--- a/tests/upgrade.sh
+++ b/tests/upgrade.sh
@@ -11,11 +11,11 @@ function upgrade {
RAW_INVENTORY=/etc/kolla/inventory
# TODO(jeffrey4l): need run a real upgrade
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks > /tmp/logs/ansible/upgrade-prechecks
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks &> /tmp/logs/ansible/upgrade-prechecks
# TODO(mgoddard): add pull action when we have a local registry service in
# CI.
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv upgrade > /tmp/logs/ansible/upgrade
- tools/kolla-ansible -i ${RAW_INVENTORY} -vvv check > /tmp/logs/ansible/check-upgrade
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv upgrade &> /tmp/logs/ansible/upgrade
+ tools/kolla-ansible -i ${RAW_INVENTORY} -vvv check &> /tmp/logs/ansible/check-upgrade
}
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 0d0a53817d..aa378b6b02 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -135,5 +135,5 @@ setup_ansible
setup_config
setup_node
-tools/kolla-ansible -i ${RAW_INVENTORY} -e ansible_user=$USER bootstrap-servers > /tmp/logs/ansible/bootstrap-servers
+tools/kolla-ansible -i ${RAW_INVENTORY} -e ansible_user=$USER -vvv bootstrap-servers &> /tmp/logs/ansible/bootstrap-servers
prepare_images