openstack/ceilometer
Code Issues Proposed changes

Merge "integration: run gabbi first"

Browse Source
This commit is contained in:
Jenkins
2016-12-20 01:03:13 +00:00
committed by Gerrit Code Review
parent 46571efcf2 31cad7b92f
commit 2a05e00f17
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,22 +95,6 @@ export NOVA_SERVICE_URL=$(openstack catalog show compute -c endpoints -f value |
export GLANCE_IMAGE_NAME=$(openstack image list | awk '/ cirros.*uec /{print $4}')
export ADMIN_TOKEN=$(openstack token issue -c id -f value)
if [ -d $BASE/new/devstack ]; then
# NOTE(sileht): on swift job permissions are wrong, I don't known why
sudo chown -R tempest:stack $BASE/new/tempest
sudo chown -R tempest:stack $BASE/data/tempest
# Run tests with tempest
cd $BASE/new/tempest
set +e
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=$?
set -e
export_subunit_data "all-plugin"
generate_reports_and_maybe_exit $TEMPEST_EXIT_CODE
cd $CEILOMETER_DIR
fi
# Run tests with gabbi
echo "Running telemetry integration test suite"
set +e
@@ -120,6 +104,17 @@ EXIT_CODE=$?
if [ -d $BASE/new/devstack ]; then
export_subunit_data "integration"
generate_reports_and_maybe_exit $EXIT_CODE
# NOTE(sileht): on swift job permissions are wrong, I don't known why
sudo chown -R tempest:stack $BASE/new/tempest
sudo chown -R tempest:stack $BASE/data/tempest
# Run tests with tempest
cd $BASE/new/tempest
sudo -H -u tempest OS_TEST_TIMEOUT=$TEMPEST_OS_TEST_TIMEOUT tox -eall-plugin -- ceilometer.tests.tempest.scenario.test_autoscaling --concurrency=$TEMPEST_CONCURRENCY
EXIT_CODE=$?
export_subunit_data "all-plugin"
generate_reports_and_maybe_exit $EXIT_CODE
fi
exit $EXIT_CODE