openstack/ceilometer
Code Issues Proposed changes

Merge "integration tests: fix generation of tests_results.html"

Browse Source
This commit is contained in:
Jenkins
2016-12-02 12:56:20 +00:00
committed by Gerrit Code Review
parent 8f2d2e7b5f af154b0c5a
commit 45aa43966f
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ceilometer/tests/integration/hooks/post_test_hook.sh
View File

@@ -14,18 +14,22 @@
# This script is executed inside post_test_hook function in devstack gate. # This script is executed inside post_test_hook function in devstack gate.
function generate_testr_results { function export_subunit_data {
target="$1"
if [ -f .testrepository/0 ]; then if [ -f .testrepository/0 ]; then
sudo .tox/functional/bin/testr last --subunit > $WORKSPACE/testrepository.subunit sudo testr last --subunit > $WORKSPACE/testrepository.subunit.$target
sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit
sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
sudo gzip -9 $BASE/logs/testrepository.subunit
sudo gzip -9 $BASE/logs/testr_results.html
sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
fi fi
} }
function generate_testr_results {
cat $WORKSPACE/testrepository.subunit.* | sudo tee $BASE/logs/testrepository.subunit
sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
sudo gzip -9 $BASE/logs/testrepository.subunit
sudo gzip -9 $BASE/logs/testr_results.html
sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
}
# If we're running in the gate find our keystone endpoint to give to # If we're running in the gate find our keystone endpoint to give to
# gabbi tests and do a chown. Otherwise the existing environment # gabbi tests and do a chown. Otherwise the existing environment
# should provide URL and TOKEN. # should provide URL and TOKEN.
@@ -57,6 +61,7 @@ if [ -d $BASE/new/devstack ]; then
sudo -H -u tempest OS_TEST_TIMEOUT=$TEMPEST_OS_TEST_TIMEOUT tox -eall-plugin -- ceilometer.tests.tempest.scenario.test_autoscaling --concurrency=$TEMPEST_CONCURRENCY sudo -H -u tempest OS_TEST_TIMEOUT=$TEMPEST_OS_TEST_TIMEOUT tox -eall-plugin -- ceilometer.tests.tempest.scenario.test_autoscaling --concurrency=$TEMPEST_CONCURRENCY
TEMPEST_EXIT_CODE=$? TEMPEST_EXIT_CODE=$?
set -e set -e
export_subunit_data "all-plugin"
if [[ $TEMPEST_EXIT_CODE != 0 ]]; then if [[ $TEMPEST_EXIT_CODE != 0 ]]; then
# Collect and parse result # Collect and parse result
generate_testr_results generate_testr_results
@@ -109,6 +114,7 @@ set -e
# Collect and parse result # Collect and parse result
if [ -n "$CEILOMETER_DIR" ]; then if [ -n "$CEILOMETER_DIR" ]; then
export_subunit_data "integration"
generate_testr_results generate_testr_results
fi fi
exit $EXIT_CODE exit $EXIT_CODE