openstack
/
openstack-ansible
Code Issues Proposed changes

Add debug data to data-plane-test 

It's highly useful to have access to debugging
information about the data plane test setup
process, so this patch adds it.

Also, the previous failures appear to be due to
the instance not being ready yet, so this patch
adds a wait for that and does some other fencing.

Change-Id: Ifeb73da3bc7bdff42ec43dafa8b56c465f61ca51
This commit is contained in:
Jesse Pretorius 2017-07-07 16:33:00 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 05f7979426
commit 8ad53fb04d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/gate-check-commit.sh
View File

@ -189,7 +189,7 @@ if [[ "${ACTION}" == "upgrade" ]]; then
unset VIRTUALENV_OPTIONS
# Kick off the data plane tester
${OSA_CLONE_DIR}/tests/data-plane-test.sh &
bash ${OSA_CLONE_DIR}/tests/data-plane-test.sh &> /var/log/data-plane-error.log &
# Fetch script to execute API availability tests, then
# background them while the upgrade runs.

11
tests/data-plane-test.sh
View File

@ -14,7 +14,7 @@
# limitations under the License.
## Shell Opts ----------------------------------------------------------------
set -e
set -e -x
## Vars ----------------------------------------------------------------------
@ -145,9 +145,14 @@ if [ -z ${INSTANCE_PUBLIC_ADDRESS+x} ]; then
echo "INSTANCE_PUBLIC_ADDRESS=${INSTANCE_PUBLIC_ADDRESS}" >> /root/demorc
fi
# Wait for the server to be ready
while [[ "$(openstack server show ${INSTANCE_UUID} --column status --format value)" != "ACTIVE" ]]; do
sleep 4
done
# If the floating IP is not associated with the test instance, associate it
if ! openstack server show test1 --column addresses --format value | grep -q ${INSTANCE_PUBLIC_ADDRESS}; then
openstack server add floating ip ${INSTANCE_NAME} ${INSTANCE_PUBLIC_ADDRESS}
if ! openstack server show ${INSTANCE_UUID} --column addresses --format value | grep -q ${INSTANCE_PUBLIC_ADDRESS}; then
openstack server add floating ip ${INSTANCE_UUID} ${INSTANCE_PUBLIC_ADDRESS}
fi
# Wait for the volume to be ready