From 1a9ca0b06ef3c0c782a12297eae0a64793efc56a Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 18 Nov 2019 14:55:50 +0100 Subject: [PATCH] upgrade tox jobs to python 3.5 Signed-off-by: guillaume.lambert Change-Id: Ifb7a1cf945167d9ad2d498e45f9eb5ea9b70db1a --- tox.ini | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tox.ini b/tox.ini index 339662342..be50d42c4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = py27 +envlist = py35 docs docs-linkcheck skipsdist = true @@ -9,7 +9,7 @@ setupdir = tests/ [testenv] passenv = USE_LIGHTY usedevelop = True -basepython = python2.7 +basepython = python3.5 deps = -r{toxinidir}/tests/requirements.txt -r{toxinidir}/tests/test-requirements.txt @@ -17,23 +17,23 @@ whitelist_externals = bash sudo changedir={toxinidir}/tests commands = - {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221,gnpy}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh ; fi" - {py27,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221}: - bash -c "sed 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java >/tmp/pivot; mv /tmp/pivot ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java" - {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221,gnpy}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)" - {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221,gnpy}: - bash -c 'if [ "$USE_LIGHTY" == "True" ]; then (cd ../lighty && ./build.sh); fi' - {py27,portmapping,topoPortMapping,rspn,topology,olm,end2end}: - ./buildHoneynode.sh - {py27,portmapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_portmapping.py - {py27,topoPortMapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_topoPortMapping.py - {py27,topology}: nosetests --with-xunit transportpce_tests/1.2.1/test_topology.py - {py27,rspn}: nosetests --with-xunit transportpce_tests/1.2.1/test_renderer_service_path_nominal.py - {py27,pce}: nosetests --with-xunit transportpce_tests/1.2.1/test_pce.py - {py27,olm}: nosetests --with-xunit transportpce_tests/1.2.1/test_olm.py + {py35,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221,gnpy}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh ; fi" + {py35,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221}: - bash -c "sed 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java >/tmp/pivot; mv /tmp/pivot ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java" + {py35,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221,gnpy}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)" + {py35,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221,gnpy}: - bash -c 'if [ "$USE_LIGHTY" == "True" ]; then (cd ../lighty && ./build.sh); fi' + {py35,portmapping,topoPortMapping,rspn,topology,olm,end2end}: - ./buildHoneynode.sh + {py35,portmapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_portmapping.py + {py35,topoPortMapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_topoPortMapping.py + {py35,topology}: nosetests --with-xunit transportpce_tests/1.2.1/test_topology.py + {py35,rspn}: nosetests --with-xunit transportpce_tests/1.2.1/test_renderer_service_path_nominal.py + {py35,pce}: nosetests --with-xunit transportpce_tests/1.2.1/test_pce.py + {py35,olm}: nosetests --with-xunit transportpce_tests/1.2.1/test_olm.py {end2end}: nosetests --with-xunit transportpce_tests/1.2.1/test_end2end.py - {py27,portmapping221,rspn221,topology221,olm221,end2end221}: - ./buildHoneynode.sh 2.2.1 - {py27,portmapping221}: nosetests --with-xunit transportpce_tests/2.2.1/test_portmapping.py - {py27,topology221}: nosetests --with-xunit transportpce_tests/2.2.1/test_topology.py - {py27,rspn221}: nosetests --with-xunit transportpce_tests/2.2.1/test_renderer_service_path_nominal.py - {py27,olm221}: nosetests --with-xunit transportpce_tests/2.2.1/test_olm.py + {py35,portmapping221,rspn221,topology221,olm221,end2end221}: - ./buildHoneynode.sh 2.2.1 + {py35,portmapping221}: nosetests --with-xunit transportpce_tests/2.2.1/test_portmapping.py + {py35,topology221}: nosetests --with-xunit transportpce_tests/2.2.1/test_topology.py + {py35,rspn221}: nosetests --with-xunit transportpce_tests/2.2.1/test_renderer_service_path_nominal.py + {py35,olm221}: nosetests --with-xunit transportpce_tests/2.2.1/test_olm.py {end2end221}: nosetests --with-xunit transportpce_tests/2.2.1/test_end2end.py #{gnpy}: - sudo docker pull atriki/gnpyrest:v1.1 {gnpy}: - sudo docker run -d -p 8008:5000 --name gnpy_tpce_rest1 atriki/gnpyrest:v1.1 -- 2.36.6