Merge "Add a py34 functional test for rabbit"

This commit is contained in:
Jenkins 2016-03-21 22:52:14 +00:00 committed by Gerrit Code Review
commit 54051687c1
2 changed files with 7 additions and 2 deletions

View File

@ -15,10 +15,11 @@
# This script is executed inside post_test_hook function in devstack gate. # This script is executed inside post_test_hook function in devstack gate.
RPC_BACKEND=$1 RPC_BACKEND=$1
PYTHON=${2:-py27}
function generate_testr_results { function generate_testr_results {
if [ -f .testrepository/0 ]; then if [ -f .testrepository/0 ]; then
sudo .tox/py27-func-${RPC_BACKEND}/bin/testr last --subunit > $WORKSPACE/testrepository.subunit sudo .tox/${PYTHON}-func-${RPC_BACKEND}/bin/testr last --subunit > $WORKSPACE/testrepository.subunit
sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit 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 /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/testrepository.subunit
@ -61,7 +62,7 @@ cd $BASE/new/oslo.messaging
# Run tests # Run tests
echo "Running oslo.messaging functional test suite" echo "Running oslo.messaging functional test suite"
# Preserve env for OS_ credentials # Preserve env for OS_ credentials
sudo -E -H -u jenkins tox -e py27-func-$RPC_BACKEND sudo -E -H -u jenkins tox -e ${PYTHON}-func-$RPC_BACKEND
EXIT_CODE=$? EXIT_CODE=$?
set -e set -e

View File

@ -27,6 +27,10 @@ commands = python setup.py build_sphinx
[testenv:py27-func-rabbit] [testenv:py27-func-rabbit]
commands = {toxinidir}/setup-test-env-rabbit.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' commands = {toxinidir}/setup-test-env-rabbit.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional'
[testenv:py34-func-rabbit]
basepython = python3.4
commands = {toxinidir}/setup-test-env-rabbit.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional'
[testenv:py27-func-pika] [testenv:py27-func-pika]
commands = {toxinidir}/setup-test-env-pika.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' commands = {toxinidir}/setup-test-env-pika.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional'