X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=a2b03df381cf22f97e1dac9b9be2aec5fb072f27;hb=21ed2d51558d570d1528babdc79eec401c79f583;hp=4a4e53be2636b69503cce97b21d2a2e7feb47880;hpb=166a4562d82e400ae1a2915d38ac6c8efeb8e56e;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index 4a4e53be2..a2b03df38 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,22 +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,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: nosetests --with-xunit transportpce_tests/1.2.1/
-  {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
-  {ordm221,portmapping221,rspn221,topology221,olm221}: - ./buildHoneynode.sh 2.2.1
-  {ordm221,portmapping221}: - nosetests --with-xunit transportpce_tests/2.2.1/test_portmapping.py
-  {ordm221,topology221}: - nosetests --with-xunit transportpce_tests/2.2.1/test_topology.py
-  {ordm221,rspn221}: - nosetests --with-xunit transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
-  {ordm221,olm221}: - nosetests --with-xunit transportpce_tests/2.2.1/test_olm.py
+  {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]