Merge "Dropping the py35 testing"
This commit is contained in:
commit
67bfb86fdf
25
.zuul.yaml
25
.zuul.yaml
|
@ -60,21 +60,6 @@
|
|||
tox_install_siblings: true
|
||||
timeout: 3600
|
||||
|
||||
- job:
|
||||
name: nova-tox-functional-py35
|
||||
parent: openstack-tox-functional-py35
|
||||
description: |
|
||||
Run tox-based functional tests for the OpenStack Nova project
|
||||
under cPython version 3.5. with Nova specific irrelevant-files list.
|
||||
Uses tox with the ``functional-py35`` environment.
|
||||
required-projects:
|
||||
- openstack/placement
|
||||
irrelevant-files: *functional-irrelevant-files
|
||||
vars:
|
||||
tox_envlist: functional-py35
|
||||
tox_install_siblings: true
|
||||
timeout: 3600
|
||||
|
||||
- job:
|
||||
name: nova-tox-functional-py36
|
||||
parent: openstack-tox
|
||||
|
@ -234,7 +219,6 @@
|
|||
- openstack-cover-jobs
|
||||
- openstack-lower-constraints-jobs
|
||||
- openstack-python-jobs
|
||||
- openstack-python35-jobs
|
||||
- openstack-python36-jobs
|
||||
- openstack-python37-jobs
|
||||
- periodic-stable-jobs
|
||||
|
@ -264,7 +248,7 @@
|
|||
- nova-lvm
|
||||
- nova-next
|
||||
- nova-tox-functional
|
||||
- nova-tox-functional-py35
|
||||
- nova-tox-functional-py36
|
||||
- tempest-full-py3:
|
||||
irrelevant-files: *dsvm-irrelevant-files
|
||||
- tempest-slow-py3:
|
||||
|
@ -276,7 +260,7 @@
|
|||
- nova-grenade-live-migration
|
||||
- nova-live-migration
|
||||
- nova-tox-functional
|
||||
- nova-tox-functional-py35
|
||||
- nova-tox-functional-py36
|
||||
- nova-next
|
||||
- tempest-full-py3:
|
||||
irrelevant-files: *dsvm-irrelevant-files
|
||||
|
@ -314,7 +298,6 @@
|
|||
irrelevant-files: *dsvm-irrelevant-files
|
||||
- os-vif-ovs:
|
||||
irrelevant-files: *dsvm-irrelevant-files
|
||||
# NOTE(mriedem): Consider moving nova-tox-functional-py36 to the
|
||||
# check and gate queues once it's stable (like openstack-python36-jobs)
|
||||
- nova-tox-functional-py36
|
||||
# NOTE(mriedem): Consider moving nova-tox-functional-py37 to the
|
||||
# check and gate queues once it's stable (like openstack-python37-jobs)
|
||||
- nova-tox-functional-py37
|
||||
|
|
|
@ -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
|
||||
|
||||
[global]
|
||||
setup-hooks =
|
||||
|
|
19
tox.ini
19
tox.ini
|
@ -1,6 +1,6 @@
|
|||
[tox]
|
||||
minversion = 3.1.1
|
||||
envlist = py{27,35},functional,pep8
|
||||
envlist = py{27,36,37},functional,pep8
|
||||
# Automatic envs (pyXX) will use the python version appropriate to that
|
||||
# env and ignore basepython inherited from [testenv]. That's what we
|
||||
# want, and we don't need to be warned about it.
|
||||
|
@ -37,18 +37,14 @@ commands =
|
|||
env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
|
||||
stestr slowest
|
||||
|
||||
[testenv:py35]
|
||||
[testenv:py36]
|
||||
commands =
|
||||
stestr run {posargs}
|
||||
env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
|
||||
|
||||
[testenv:py36]
|
||||
commands =
|
||||
{[testenv:py35]commands}
|
||||
|
||||
[testenv:py37]
|
||||
commands =
|
||||
{[testenv:py35]commands}
|
||||
{[testenv:py36]commands}
|
||||
|
||||
[testenv:pep8]
|
||||
description =
|
||||
|
@ -101,14 +97,7 @@ commands =
|
|||
stestr slowest
|
||||
|
||||
# TODO(gcb) Merge this into [testenv:functional] when functional tests are gating
|
||||
# with python 3.5
|
||||
[testenv:functional-py35]
|
||||
basepython = python3.5
|
||||
setenv = {[testenv]setenv}
|
||||
deps = {[testenv:functional]deps}
|
||||
commands =
|
||||
{[testenv:functional]commands}
|
||||
|
||||
# with python 3
|
||||
[testenv:functional-py36]
|
||||
basepython = python3.6
|
||||
setenv = {[testenv]setenv}
|
||||
|
|
Loading…
Reference in New Issue