diff --git a/tests/deploy-bifrost.sh b/tests/deploy-bifrost.sh index f45e40c4bb77b2af6d4b5e2458f8a9f9003a2bf0..86e3d15363c47e8f056d6e861066e3c2bfd83c0f 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 91e4a5f9601c15dbabd0ada65c8fa0d8caaa3661..e72d7ad4628c5350825f2b0f02d5590557185def 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 f8b2c04f405662718e742c492627738c5d334d19..db0854cff7e710e12524cb04d4068c130e65cc13 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 d6e9f5d248a7c27a308d81ba0b48aa8209070d73..72966166a4c6730df69398d31dba59c263db9ec7 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 d3ebba63d1d934e16e2dad1b8167d90036f61cd9..898787e707f340fc056395442b02816b9aa15138 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 786256ee0af3901ac10a481e99caaa116e483fdd..2de7d575d818a497e43967fd4f2046a9d96cb3d1 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -136,5 +136,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