From 7f512e2a2b84c02b18908ec35eed78a9b0c9330a Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Tue, 2 Apr 2013 10:13:29 -0700 Subject: [PATCH] explicitly exit from tests this commit adds an explicit exit from the tempest tests. Sometimes vagrant's ssh command does not return, this explicit exit appears to guarentee that it exits. --- test_scripts/openstack_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test_scripts/openstack_test.sh b/test_scripts/openstack_test.sh index 8f76aea..b2d1129 100644 --- a/test_scripts/openstack_test.sh +++ b/test_scripts/openstack_test.sh @@ -71,9 +71,9 @@ elif [ $test_mode = 'tempest_smoke' ]; then # run the tempest smoke tests bundle exec vagrant ssh -c 'sudo puppet apply --certname tempest --modulepath=/etc/puppet/modules-0/ /etc/puppet/manifests/site.pp --trace --debug' openstack_controller # run tempest tests - bundle exec vagrant ssh -c 'cd /var/lib/tempest/;sudo ./jenkins_launch_script.sh --smoke;' openstack_controller + bundle exec vagrant ssh -c 'cd /var/lib/tempest/;sudo ./jenkins_launch_script.sh --smoke;exit $?;' openstack_controller elif [ $test_mode = 'tempest_full' ]; then - bundle exec vagrant ssh -c 'cd /var/lib/tempest/;sudo ./jenkins_launch_script.sh;' openstack_controller + bundle exec vagrant ssh -c 'cd /var/lib/tempest/;sudo ./jenkins_launch_script.sh;exit $?;' openstack_controller elif [ $test_mode = 'unit' ]; then bundle exec rake test:unit else