Merge "Fix building OVS after python2 removal"

tox.ini

@@ -58,6 +58,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
@@ -67,12 +68,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.
 

zuul.d/project.yaml

@@ -8,10 +8,8 @@
     check:
       jobs:
         - openstack-tox-functional
-        - openstack-tox-functional-py36
         - ovsdbapp-tempest-dsvm-networking-ovn-ovs-release
     gate:
       jobs:
         - openstack-tox-functional
-        - openstack-tox-functional-py36
         - ovsdbapp-tempest-dsvm-networking-ovn-ovs-release