openstack/oslo.messaging
Code Issues Proposed changes

tox: rename zeromq target

Browse Source 
The current zeromq target name are too long and reach the limitation
of 127 chars of the sheband of the virtualenv binary.

A target name must not be more than 22 chars to run in gate with
the tox job template.

This renames them to a shorter one.

It also creates aliases for the legacy jobs that we will remove
when the tox jobs are ready.

Change-Id: I5cbc368e7ea252f8c0c949c8e7ee3a70a560db22
This commit is contained in:
Mehdi Abaakouk 2016-12-15 09:42:01 +01:00
parent 8fefbc064d
commit 8d2331a3b7
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bindep.txt
View File

@ -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]

13
oslo_messaging/tests/functional/gate/post_test_hook.sh
View File

@ -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
;;

11
tox.ini
View File

@ -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]