Browse Source

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
changes/19/691519/9
Adit Sarfaty 2 years ago
parent
commit
4a3e8191cd
5 changed files with 6 additions and 60 deletions
  1. +2
    -26
      .zuul.yaml
  2. +2
    -2
      TESTING.rst
  3. +0
    -1
      bindep.txt
  4. +0
    -6
      setup.cfg
  5. +2
    -25
      tox.ini

+ 2
- 26
.zuul.yaml View File

@ -2,8 +2,8 @@
templates:
- build-openstack-docs-pti
- check-requirements
- openstack-python-jobs-neutron
- openstack-python3-train-jobs
- openstack-python3-ussuri-jobs-neutron
- openstack-python3-ussuri-jobs
check:
jobs:
- vmware-tox-lower-constraints
@ -18,18 +18,6 @@
- openstack/neutron-vpnaas
- x/tap-as-a-service
- 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:
timeout: 5400
required-projects:
@ -69,18 +57,6 @@
- openstack/neutron-vpnaas
- x/tap-as-a-service
- 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:
timeout: 5400
required-projects:


+ 2
- 2
TESTING.rst View File

@ -84,7 +84,7 @@ environments for running test cases. It uses `Testr`_ for managing the running
of the test cases.
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
the tracking of long-running tests and other things.
@ -131,7 +131,7 @@ vmware_nsx/tests/unit/nsx_v/test_plugin.py::
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
~~~~~~~~~~~~~~~~~


+ 0
- 1
bindep.txt View File

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


+ 0
- 6
setup.cfg View File

@ -12,9 +12,6 @@ classifier =
Intended Audience :: System Administrators
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
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.
# More info can be found on the ML:
# http://lists.openstack.org/pipermail/openstack-dev/2016-June/097849.html
[wheel]
universal = 1

+ 2
- 25
tox.ini View File

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


Loading…
Cancel
Save