Merge "Dropping the py35 testing"

This commit is contained in:
Zuul 2019-04-18 01:14:36 +00:00 committed by Gerrit Code Review
commit d4873f983b
3 changed files with 19 additions and 19 deletions

View File

@ -19,23 +19,23 @@
bindep_profile: rabbit
- job:
name: oslo.messaging-tox-py35-func-amqp1
parent: openstack-tox-py35
name: oslo.messaging-tox-py36-func-amqp1
parent: openstack-tox-py36
vars:
tox_envlist: py35-func-amqp1
tox_envlist: py36-func-amqp1
- job:
name: oslo.messaging-tox-py35-func-kafka
parent: openstack-tox-py35
name: oslo.messaging-tox-py36-func-kafka
parent: openstack-tox-py36
vars:
tox_envlist: py35-func-kafka
tox_envlist: py36-func-kafka
bindep_profile: kafka
- job:
name: oslo.messaging-tox-py35-func-rabbit
parent: openstack-tox-py35
name: oslo.messaging-tox-py36-func-rabbit
parent: openstack-tox-py36
vars:
tox_envlist: py35-func-rabbit
tox_envlist: py36-func-rabbit
bindep_profile: rabbit
# Begin v3 native jobs
@ -232,11 +232,11 @@
voting: false
- oslo.messaging-tox-py27-func-kafka:
voting: false
- oslo.messaging-tox-py35-func-rabbit:
- oslo.messaging-tox-py36-func-rabbit:
voting: false
- oslo.messaging-tox-py35-func-amqp1:
- oslo.messaging-tox-py36-func-amqp1:
voting: false
- oslo.messaging-tox-py35-func-kafka:
- oslo.messaging-tox-py36-func-kafka:
voting: false
- oslo.messaging-src-dsvm-full-rabbit

View File

@ -16,7 +16,7 @@ classifier =
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
[extras]
# package dependencies for optional (non-rabbitmq) messaging drivers.

12
tox.ini
View File

@ -48,8 +48,8 @@ setenv =
TRANSPORT_DRIVER=rabbit
commands = pifpaf run rabbitmq -- stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py35-func-rabbit]
basepython = python3.5
[testenv:py36-func-rabbit]
basepython = python3.6
setenv =
{[testenv]setenv}
TRANSPORT_DRIVER=rabbit
@ -72,8 +72,8 @@ setenv =
WORKDIR={toxworkdir}
commands = {toxinidir}/tools/setup-test-env-amqp1.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py35-func-amqp1]
basepython = python3.5
[testenv:py36-func-amqp1]
basepython = python3.6
setenv =
{[testenv]setenv}
TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:5672//
@ -81,8 +81,8 @@ setenv =
WORKDIR={toxworkdir}
commands = {toxinidir}/tools/setup-test-env-amqp1.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py35-func-kafka]
basepython = python3.5
[testenv:py36-func-kafka]
basepython = python3.6
setenv =
{[testenv]setenv}
TRANSPORT_URL=kafka://127.0.0.1:9092/