X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=tox.ini;h=9bcaf4fb8c19479622fc85d3f1964d94464f40fc;hp=4481214610f35d494c0d75e4de0553b03577c020;hb=fb27343dc571a64a0690badae85a85ef101c0090;hpb=3237056b2b522d1cb3c9278c8c4062076f6814c1

diff --git a/tox.ini b/tox.ini
index 448121461..9bcaf4fb8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,20 +15,23 @@ deps =
 whitelist_externals = bash
 changedir={toxinidir}/tests
 commands =
-  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh  ; fi"
-  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)"
-  {py27,topoPortMapping}: - ./buildTesttool.sh
-  {py27,portmapping,rspn,topology,olm,end2end}: - ./buildHoneynode.sh
-  #py27: nosetests --with-xunit transportpce_tests/
-  {py27,portmapping}: - nosetests --with-xunit transportpce_tests/test_portmapping.py
-  {py27,topoPortMapping}: - nosetests --with-xunit transportpce_tests/test_topoPortMapping.py
-  {py27,topology}: - nosetests --with-xunit transportpce_tests/test_topology.py
-  {py27,rspn}: - nosetests --with-xunit transportpce_tests/test_renderer_service_path_nominal.py
-  {py27,pce}: - nosetests --with-xunit transportpce_tests/test_pce.py
-  {py27,olm}: - nosetests --with-xunit transportpce_tests/test_olm.py
-  {servicehandler}: - ./SH_func_tests.sh
-  {servicehandler}: - nosetests --with-xunit transportpce_tests/test_servicehandler.py
-  {py27,end2end}: - nosetests --with-xunit transportpce_tests/test_end2end.py
+  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221}: - 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}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)"
+  {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
+  #{py27,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
+  {py27,end2end221}: nosetests --with-xunit transportpce_tests/2.2.1/test_end2end.py
 
 
 [testenv:docs]