Merge "Move jobs to py38"

This commit is contained in:
Zuul 2021-02-03 16:52:10 +00:00 committed by Gerrit Code Review
commit 38a06028f2
2 changed files with 21 additions and 25 deletions

View File

@ -1,29 +1,29 @@
- job: - job:
name: oslo.messaging-tox-py36-func-scenario01 name: oslo.messaging-tox-py38-func-scenario01
parent: openstack-tox-py36 parent: openstack-tox-py38
vars: vars:
tox_envlist: py36-func-scenario01 tox_envlist: py38-func-scenario01
bindep_profile: rabbit bindep_profile: rabbit
- job: - job:
name: oslo.messaging-tox-py36-func-scenario02 name: oslo.messaging-tox-py38-func-scenario02
parent: openstack-tox-py36 parent: openstack-tox-py38
vars: vars:
tox_envlist: py36-func-scenario02 tox_envlist: py38-func-scenario02
bindep_profile: rabbit kafka amqp1 bindep_profile: rabbit kafka amqp1
- job: - job:
name: oslo.messaging-tox-py36-func-scenario03 name: oslo.messaging-tox-py38-func-scenario03
parent: openstack-tox-py36 parent: openstack-tox-py38
vars: vars:
tox_envlist: py36-func-scenario03 tox_envlist: py38-func-scenario03
bindep_profile: rabbit amqp1 bindep_profile: rabbit amqp1
- job: - job:
name: oslo.messaging-tox-py36-func-scenario04 name: oslo.messaging-tox-py38-func-scenario04
parent: openstack-tox-py36 parent: openstack-tox-py38
vars: vars:
tox_envlist: py36-func-scenario04 tox_envlist: py38-func-scenario04
bindep_profile: kafka amqp1 bindep_profile: kafka amqp1
# Begin v3 native jobs # Begin v3 native jobs
@ -114,12 +114,12 @@
- release-notes-jobs-python3 - release-notes-jobs-python3
check: check:
jobs: jobs:
- oslo.messaging-tox-py36-func-scenario01 - oslo.messaging-tox-py38-func-scenario01
- oslo.messaging-tox-py36-func-scenario02: - oslo.messaging-tox-py38-func-scenario02:
voting: false voting: false
- oslo.messaging-tox-py36-func-scenario03: - oslo.messaging-tox-py38-func-scenario03:
voting: false voting: false
- oslo.messaging-tox-py36-func-scenario04: - oslo.messaging-tox-py38-func-scenario04:
voting: false voting: false
- oslo.messaging-src-dsvm-full-rabbit - oslo.messaging-src-dsvm-full-rabbit
- oslo.messaging-src-dsvm-full-amqp1-hybrid: - oslo.messaging-src-dsvm-full-amqp1-hybrid:
@ -133,5 +133,5 @@
gate: gate:
jobs: jobs:
- oslo.messaging-tox-py36-func-scenario01 - oslo.messaging-tox-py38-func-scenario01
- oslo.messaging-src-dsvm-full-rabbit - oslo.messaging-src-dsvm-full-rabbit

12
tox.ini
View File

@ -54,22 +54,19 @@ commands =
# scenario03 amqp rabbit # scenario03 amqp rabbit
# scenario04 amqp kafka # scenario04 amqp kafka
# #
[testenv:py36-func-scenario01] [testenv:py38-func-scenario01]
basepython = python3.6
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
SCENARIO=scenario01 SCENARIO=scenario01
commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py36-func-scenario02] [testenv:py38-func-scenario02]
basepython = python3.6
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
SCENARIO=scenario02 SCENARIO=scenario02
commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py36-func-scenario03] [testenv:py38-func-scenario03]
basepython = python3.6
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
SCENARIO=scenario03 SCENARIO=scenario03
@ -77,8 +74,7 @@ setenv =
WORKDIR={toxworkdir} WORKDIR={toxworkdir}
commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py36-func-scenario04] [testenv:py38-func-scenario04]
basepython = python3.6
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
SCENARIO=scenario04 SCENARIO=scenario04