diff options
| -rw-r--r-- | .zuul.yaml | 1 | ||||
| -rwxr-xr-x | ceilometer/tests/integration/hooks/post_test_hook.sh | 93 | ||||
| -rw-r--r-- | playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml | 5 |
3 files changed, 4 insertions, 95 deletions
@@ -20,6 +20,7 @@ - openstack/aodh - openstack/ceilometer - openstack/panko + - openstack/telemetry-tempest-plugin # following are required when DEVSTACK_GATE_HEAT, which this # job turns on - openstack/dib-utils diff --git a/ceilometer/tests/integration/hooks/post_test_hook.sh b/ceilometer/tests/integration/hooks/post_test_hook.sh deleted file mode 100755 index 3cde0681..00000000 --- a/ceilometer/tests/integration/hooks/post_test_hook.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -xe - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -# This script is executed inside post_test_hook function in devstack gate. - -function export_subunit_data { - target="$1" - if [ -f .testrepository/0 ]; then - sudo testr last --subunit > $WORKSPACE/testrepository.subunit.$target - 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 $USER:$USER $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 -} - -function generate_telemetry_report(){ - set +x - set +e - - echo "* Message queue status:" - sudo rabbitmqctl list_queues | grep -e \\.sample -e \\.info - - source $BASE/new/devstack/openrc admin admin - - echo "* Heat stack:" - openstack stack show integration_test - echo "* Alarm list:" - aodh alarm list - echo "* Event list:" - ceilometer event-list -q 'event_type=string::compute.instance.create.end' - echo "* Nova instance list:" - openstack server list - - echo "* Gnocchi instance list:" - gnocchi resource list -t instance - for instance_id in $(openstack server list -f value -c ID); do - echo "* Nova instance detail:" - openstack server show $instance_id - echo "* Gnocchi instance detail:" - gnocchi resource show -t instance $instance_id - echo "* Gnocchi measures for instance ${instance_id}:" - gnocchi measures show -r $instance_id cpu_util - done - - gnocchi status - - echo "* Unprocessed measures:" - for key in $(redis-cli --scan --pattern 'incoming*'); do echo -n "$key length = " && redis-cli llen $key; done - - set -e - set -x -} - -function generate_reports_and_maybe_exit() { - local ret="$1" - if [[ $ret != 0 ]]; then - # Collect and parse result - generate_telemetry_report - generate_testr_results - exit $ret - fi -} - - -# Run tests with tempest -sudo chown -R tempest:stack $BASE/new/tempest -sudo chown -R tempest:stack $BASE/data/tempest -cd $BASE/new/tempest -set +e -sudo -H -u tempest OS_TEST_TIMEOUT=$TEMPEST_OS_TEST_TIMEOUT tox -eall-plugin -- ceilometer.tests.tempest --concurrency=$TEMPEST_CONCURRENCY -EXIT_CODE=$? -set -e -export_subunit_data "all-plugin" -generate_reports_and_maybe_exit $EXIT_CODE - -exit $EXIT_CODE diff --git a/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml b/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml index 41afd103..a2b851a7 100644 --- a/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml +++ b/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml @@ -35,17 +35,18 @@ export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko" + export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko openstack/telemetry-tempest-plugin" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin telemetry-tempest-plugin git://git.openstack.org/openstack/telemetry-tempest-plugin" export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi" export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high" export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15" export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME function post_test_hook { - cd /opt/stack/new/ceilometer/ceilometer/tests/integration/hooks/ + cd /opt/stack/new/telemetry-tempest-plugin/telemetry_tempest_plugin/integration/hooks/ ./post_test_hook.sh } export -f post_test_hook |