From 8fe6db0acc1a1f9c0ae8c6cee6ae8d88ae83f71a Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 8 May 2013 14:13:57 -0400 Subject: [PATCH] convert test runner to tox We now have tox definitions for the test runs for tempest, which lets us control the gate commands from tempest. Use tox to run tempest in the gate now. Part of bp:tempest-repo-restructure Change-Id: Idc775c3caff0284da8d7f735d76b3e50e39bb365 --- devstack-vm-gate.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 940f0eac..28b5761a 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -211,16 +211,14 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then fi if [[ "$DEVSTACK_GATE_TEMPEST_FULL" -eq "1" ]]; then echo "Running tempest full test suite" - sudo -H -u stack NOSE_XUNIT_FILE=nosetests-full.xml nosetests --logging-format '%(asctime)-15s %(message)s' --with-xunit -sv tempest - echo "Running tempest/cli test suite" - sudo -H -u stack NOSE_XUNIT_FILE=nosetests-cli.xml nosetests --logging-format '%(asctime)-15s %(message)s' --with-xunit -sv cli + sudo -H -u stack tox -efull else echo "Running tempest smoke tests" - sudo -H -u stack NOSE_XUNIT_FILE=nosetests-smoke.xml nosetests --logging-format '%(asctime)-15s %(message)s' --with-xunit -sv --attr=type=smoke tempest + sudo -H -u stack tox -esmoke fi if [[ "$DEVSTACK_GATE_TEMPEST_COVERAGE" -eq "1" ]] ; then echo "Generating coverage report" - sudo -H -u stack python -m tools/tempest_coverage -c report --html -o $BASE/new/tempest/coverage-report + sudo -H -u stack tox -ecoverage fi else # Jenkins expects at least one nosetests file. If we're not running