openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Generate subunit result for pingtest"

This commit is contained in:
Jenkins 2017-05-29 14:02:57 +00:00 committed by Gerrit Code Review
parent 0dc5ceb35c 44a99aced0
commit 147229b902
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/validate-simple/defaults/main.yml
View File

@ -26,3 +26,4 @@ validate_template_environment:
image: "{{ validate_image_name }}"
public_net_name: "{{ public_net_name }}"
skip_pingtest_cleanup: false
generate_pingtest_subunit: false

16
roles/validate-simple/templates/overcloud-validate.sh.j2
View File

@ -39,6 +39,16 @@ function cleanup {
trap cleanup EXIT #nodocs
{% endif %}
{% if generate_pingtest_subunit|bool %}
# Install dependencies for generate_subunit #nodocs
sudo yum install -y python-os-testr
## * Start measuring time of test
## ::
TEST_START=$(date +%s)
{% endif %}
## * Source tenantrc file
## ::
@ -136,6 +146,9 @@ ping -c 1 $vm1_ip
if [ "$?" == "0" ]; then
echo "Overcloud pingtest, SUCCESS"
{% if generate_pingtest_subunit|bool %}
generate-subunit $TEST_START $(( $(date +%s) - TEST_START)) success pingtest > {{ working_dir }}/pingtest.subunit
{% endif %}
exit 0
else
nova console-log Server1
@ -144,6 +157,9 @@ else
neutron agent-list
openstack stack show {{ validate_stack_name }}
echo "Overcloud pingtest, FAIL"
{% if generate_pingtest_subunit|bool %}
generate-subunit $TEST_START $(( $(date +%s) - TEST_START)) fail pingtest > {{ working_dir }}/pingtest.subunit
{% endif %}
exit 1
fi