From d5420ab5d248b93c5ce1c65d29521dc52ad3c5ae Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Thu, 3 Oct 2019 16:09:47 -0500 Subject: [PATCH] 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 --- tox.ini | 7 +------ zuul.d/project.yaml | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/tox.ini b/tox.ini index bd94bda5..0a0a9218 100644 --- a/tox.ini +++ b/tox.ini @@ -43,6 +43,7 @@ basepython = python3 commands = oslo_debug_helper {posargs} [testenv:functional] +basepython = python3 setenv = {[testenv]setenv} OS_TEST_PATH=./ovsdbapp/tests/functional OVS_SRCDIR={envdir}/src/ovs @@ -51,12 +52,6 @@ commands = {toxinidir}/tools/setup-ovs.sh {[testenv]commands} -[testenv:functional-py36] -basepython = python3.6 -setenv = {[testenv:functional]setenv} -passenv = {[testenv:functional]passenv} -commands = {[testenv:functional]commands} - [flake8] # E123, E125 skipped as they are invalid PEP-8. diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 1030c872..b0ebd4bb 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -7,11 +7,9 @@ jobs: - openstack-tox-lower-constraints - openstack-tox-functional - - openstack-tox-functional-py36 - ovsdbapp-tempest-dsvm-networking-ovn-ovs-release gate: jobs: - openstack-tox-lower-constraints - openstack-tox-functional - - openstack-tox-functional-py36 - ovsdbapp-tempest-dsvm-networking-ovn-ovs-release