Stop testing python 2

Since it's no longer supported past Train, lets stop
running the tests.
Please also see the related neutron patch:
I1c171ab906a3b4c66558163ad26947ebf710a276

Change-Id: Ic5361ac8495493d45603a57fcaac5f8385c681b7
This commit is contained in:
Adit Sarfaty 2019-10-27 15:01:28 +02:00
parent 5adc16f0bd
commit 4a3e8191cd
5 changed files with 6 additions and 60 deletions

View File

@ -2,8 +2,8 @@
templates: templates:
- build-openstack-docs-pti - build-openstack-docs-pti
- check-requirements - check-requirements
- openstack-python-jobs-neutron - openstack-python3-ussuri-jobs-neutron
- openstack-python3-train-jobs - openstack-python3-ussuri-jobs
check: check:
jobs: jobs:
- vmware-tox-lower-constraints - vmware-tox-lower-constraints
@ -18,18 +18,6 @@
- openstack/neutron-vpnaas - openstack/neutron-vpnaas
- x/tap-as-a-service - x/tap-as-a-service
- openstack/octavia - openstack/octavia
- openstack-tox-py27:
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/octavia
- openstack-tox-py36: - openstack-tox-py36:
timeout: 5400 timeout: 5400
required-projects: required-projects:
@ -69,18 +57,6 @@
- openstack/neutron-vpnaas - openstack/neutron-vpnaas
- x/tap-as-a-service - x/tap-as-a-service
- openstack/octavia - openstack/octavia
- openstack-tox-py27:
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/octavia
- openstack-tox-py36: - openstack-tox-py36:
timeout: 5400 timeout: 5400
required-projects: required-projects:

View File

@ -84,7 +84,7 @@ environments for running test cases. It uses `Testr`_ for managing the running
of the test cases. of the test cases.
Tox handles the creation of a series of `virtualenvs`_ that target specific Tox handles the creation of a series of `virtualenvs`_ that target specific
versions of Python (2.7, 3.3, etc). versions of Python.
Testr handles the parallel execution of series of test cases as well as Testr handles the parallel execution of series of test cases as well as
the tracking of long-running tests and other things. the tracking of long-running tests and other things.
@ -131,7 +131,7 @@ vmware_nsx/tests/unit/nsx_v/test_plugin.py::
or:: or::
$ tox -e py27 vmware_nsx.tests.unit.nsx_v.test_plugin.TestSubnetsV2 $ tox -e py37 vmware_nsx.tests.unit.nsx_v.test_plugin.TestSubnetsV2
Adding more tests Adding more tests
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~

View File

@ -10,7 +10,6 @@ libffi-devel [platform:rpm]
# MySQL and PostgreSQL databases since some jobs are set up in # MySQL and PostgreSQL databases since some jobs are set up in
# OpenStack infra that need these like # OpenStack infra that need these like
# periodic-neutron-py27-with-oslo-master and
# periodic-neutron-py35-with-neutron-lib-master. # periodic-neutron-py35-with-neutron-lib-master.
haproxy haproxy
libmysqlclient-dev [platform:dpkg test] libmysqlclient-dev [platform:dpkg test]

View File

@ -12,9 +12,6 @@ classifier =
Intended Audience :: System Administrators Intended Audience :: System Administrators
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.7
@ -125,6 +122,3 @@ autodoc_index_modules = 1
# NOTE(boden): enable and validate once a new version of pbr is released. # NOTE(boden): enable and validate once a new version of pbr is released.
# More info can be found on the ML: # More info can be found on the ML:
# http://lists.openstack.org/pipermail/openstack-dev/2016-June/097849.html # http://lists.openstack.org/pipermail/openstack-dev/2016-June/097849.html
[wheel]
universal = 1

27
tox.ini
View File

@ -1,9 +1,10 @@
[tox] [tox]
envlist = py27,py37,pep8 envlist = py37,pep8
minversion = 2.0 minversion = 2.0
skipsdist = True skipsdist = True
[testenv] [testenv]
basepython = python3
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning PYTHONWARNINGS=default::DeprecationWarning
passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
@ -39,7 +40,6 @@ commands =
[testenv:functional] [testenv:functional]
basepython = python3
setenv = {[testenv]setenv} setenv = {[testenv]setenv}
{[testenv:common]setenv} {[testenv:common]setenv}
OS_TEST_PATH=./vmware_nsx/tests/functional OS_TEST_PATH=./vmware_nsx/tests/functional
@ -49,7 +49,6 @@ deps =
-r{toxinidir}/vmware_nsx/tests/functional/requirements.txt -r{toxinidir}/vmware_nsx/tests/functional/requirements.txt
[testenv:dsvm-functional] [testenv:dsvm-functional]
basepython = python3
setenv = OS_SUDO_TESTING=1 setenv = OS_SUDO_TESTING=1
OS_FAIL_ON_MISSING_DEPS=1 OS_FAIL_ON_MISSING_DEPS=1
OS_TEST_TIMEOUT=180 OS_TEST_TIMEOUT=180
@ -64,15 +63,10 @@ commands =
sitepackages = True sitepackages = True
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:py27]
basepython = python2.7
setenv = OS_FAIL_ON_MISSING_DEPS=1
[testenv:py36] [testenv:py36]
basepython = python3.6 basepython = python3.6
setenv = OS_FAIL_ON_MISSING_DEPS=1 setenv = OS_FAIL_ON_MISSING_DEPS=1
@ -81,17 +75,7 @@ setenv = OS_FAIL_ON_MISSING_DEPS=1
basepython = python3.7 basepython = python3.7
setenv = OS_FAIL_ON_MISSING_DEPS=1 setenv = OS_FAIL_ON_MISSING_DEPS=1
[testenv:py27-dev]
basepython = python2.7
commands =
{[testenv:dev]commands}
pip freeze
stestr run {posargs}
whitelist_externals =
stestr
[testenv:py3-dev] [testenv:py3-dev]
basepython = python3.7
commands = commands =
{[testenv:dev]commands} {[testenv:dev]commands}
pip freeze pip freeze
@ -109,7 +93,6 @@ whitelist_externals =
stestr stestr
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = commands =
# If it is easier to add a check via a shell script, consider adding it in this file # If it is easier to add a check via a shell script, consider adding it in this file
sh ./tools/misc-sanity-checks.sh sh ./tools/misc-sanity-checks.sh
@ -124,7 +107,6 @@ whitelist_externals =
bash bash
[testenv:pep8-dev] [testenv:pep8-dev]
basepython = python3
commands = commands =
{[testenv:dev]commands} {[testenv:dev]commands}
pip freeze pip freeze
@ -143,13 +125,11 @@ whitelist_externals =
commands = bandit -r vmware_nsx -n 5 -ll commands = bandit -r vmware_nsx -n 5 -ll
[testenv:cover] [testenv:cover]
basepython = python3
commands = commands =
python setup.py testr --coverage --testr-args='{posargs}' python setup.py testr --coverage --testr-args='{posargs}'
coverage report coverage report
[testenv:docs] [testenv:docs]
basepython = python3
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -b html doc/source doc/build/html commands = sphinx-build -b html doc/source doc/build/html
@ -195,7 +175,6 @@ commands =
check-uuid --fix check-uuid --fix
[testenv:lower-constraints] [testenv:lower-constraints]
basepython = python3
deps = deps =
-c{toxinidir}/lower-constraints.txt -c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
@ -203,7 +182,6 @@ deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
[testenv:lower-constraints-dev] [testenv:lower-constraints-dev]
basepython = python3
commands = commands =
{[testenv:dev]commands} {[testenv:dev]commands}
pip freeze pip freeze
@ -218,7 +196,6 @@ deps =
commands = {posargs} commands = {posargs}
[testenv:requirements-check-dev] [testenv:requirements-check-dev]
basepython = python3
commands = commands =
pip install -q -e "git+https://opendev.org/openstack/requirements#egg=requirements" pip install -q -e "git+https://opendev.org/openstack/requirements#egg=requirements"
pip freeze pip freeze