Fix building OVS after python2 removal
Switch functional to use python3 to install python3-based dependencies, which the OVS build checks for. Also, remove the py36 test Change-Id: I2d9599d7050a15f459e6845a112ffc9948b2a7bd
This commit is contained in:
parent
74b52bb349
commit
d5420ab5d2
7
tox.ini
7
tox.ini
|
@ -43,6 +43,7 @@ basepython = python3
|
||||||
commands = oslo_debug_helper {posargs}
|
commands = oslo_debug_helper {posargs}
|
||||||
|
|
||||||
[testenv:functional]
|
[testenv:functional]
|
||||||
|
basepython = python3
|
||||||
setenv = {[testenv]setenv}
|
setenv = {[testenv]setenv}
|
||||||
OS_TEST_PATH=./ovsdbapp/tests/functional
|
OS_TEST_PATH=./ovsdbapp/tests/functional
|
||||||
OVS_SRCDIR={envdir}/src/ovs
|
OVS_SRCDIR={envdir}/src/ovs
|
||||||
|
@ -51,12 +52,6 @@ commands =
|
||||||
{toxinidir}/tools/setup-ovs.sh
|
{toxinidir}/tools/setup-ovs.sh
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
|
|
||||||
[testenv:functional-py36]
|
|
||||||
basepython = python3.6
|
|
||||||
setenv = {[testenv:functional]setenv}
|
|
||||||
passenv = {[testenv:functional]passenv}
|
|
||||||
commands = {[testenv:functional]commands}
|
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
# E123, E125 skipped as they are invalid PEP-8.
|
# E123, E125 skipped as they are invalid PEP-8.
|
||||||
|
|
||||||
|
|
|
@ -7,11 +7,9 @@
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-lower-constraints
|
- openstack-tox-lower-constraints
|
||||||
- openstack-tox-functional
|
- openstack-tox-functional
|
||||||
- openstack-tox-functional-py36
|
|
||||||
- ovsdbapp-tempest-dsvm-networking-ovn-ovs-release
|
- ovsdbapp-tempest-dsvm-networking-ovn-ovs-release
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-lower-constraints
|
- openstack-tox-lower-constraints
|
||||||
- openstack-tox-functional
|
- openstack-tox-functional
|
||||||
- openstack-tox-functional-py36
|
|
||||||
- ovsdbapp-tempest-dsvm-networking-ovn-ovs-release
|
- ovsdbapp-tempest-dsvm-networking-ovn-ovs-release
|
||||||
|
|
Loading…
Reference in New Issue