diff options
| -rw-r--r-- | bindep.txt | 10 | ||||
| -rwxr-xr-x | oslo_messaging/tests/functional/gate/post_test_hook.sh | 13 | ||||
| -rw-r--r-- | tox.ini | 11 |
3 files changed, 21 insertions, 13 deletions
@@ -13,11 +13,11 @@ libffi-devel [platform:rpm] # kombu/pika rabbitmq-server [platform:dpkg rabbit pika] -# zeromq -redis-sentinel [platform:ubuntu !platform:ubuntu-trusty zeromq] -redis-server [platform:dpkg zeromq] -python-redis [platform:dpkg zeromq] -zookeeperd [platform:dpkg zeromq] +# zmq +redis-sentinel [platform:ubuntu !platform:ubuntu-trusty zmq] +redis-server [platform:dpkg zmq] +python-redis [platform:dpkg zmq] +zookeeperd [platform:dpkg zmq] # AMQP1 dpkg qpidd [platform:dpkg amqp1] diff --git a/oslo_messaging/tests/functional/gate/post_test_hook.sh b/oslo_messaging/tests/functional/gate/post_test_hook.sh index fb8778b..107988b 100755 --- a/oslo_messaging/tests/functional/gate/post_test_hook.sh +++ b/oslo_messaging/tests/functional/gate/post_test_hook.sh @@ -14,7 +14,16 @@ # This script is executed inside post_test_hook function in devstack gate. -RPC_BACKEND=$1 + +# NOTE(sileht): we have to rename the zmq tox target to shorter name +# this is to not break the current dsvm gating system until we switch to the tox one +case $1 in + zeromq) RPC_BACKEND=zmq;; + zeromq-proxy) RPC_BACKEND=zmq-proxy;; + zeromq-pub-sub) RPC_BACKEND=zmq-pubsub;; + *) RPC_BACKEND=$1;; +esac + PYTHON=${2:-py27} function generate_testr_results { @@ -43,7 +52,7 @@ fi # Install required packages case $RPC_BACKEND in - zeromq|zeromq-proxy|zeromq-pub-sub) + zmq|zmq-proxy|zmq-pubsub) sudo apt-get update -y sudo apt-get install -y redis-server python-redis ;; @@ -89,20 +89,19 @@ setenv = WORKDIR={toxworkdir} commands = {toxinidir}/setup-test-env-amqp1.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' -[testenv:py27-func-zeromq] +[testenv:py27-func-zmq] commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' -[testenv:py34-func-zeromq] -basepython = python3.4 +[testenv:py34-func-zmq] commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' -[testenv:py27-func-zeromq-direct-static] +[testenv:py27-func-zmq-direct] commands = {toxinidir}/setup-test-env-zmq-direct-static.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' -[testenv:py27-func-zeromq-proxy] +[testenv:py27-func-zmq-proxy] commands = {toxinidir}/setup-test-env-zmq-proxy.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' -[testenv:py27-func-zeromq-pub-sub] +[testenv:py27-func-zmq-pubsub] commands = {toxinidir}/setup-test-env-zmq-pub-sub.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' [testenv:bandit] |