review tox.ini E2E tests sequence

- pull all end-to-end 1.2.1 or 2.2.1 tests at the end
- make them non-voting

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9b38b78995261ebe82f9ca9bc2390465c602de03

diff --git a/tox.ini b/tox.ini
index 1fafac08aab46f79f3343aa1084104db36ebf4d1..fb47ad283d739d4f469ef449487496ef94e5a7c0 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -42,7 +42,7 @@ commands =
   {py3,rspn}: nosetests --with-xunit transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
   {py3,pce}: nosetests --with-xunit transportpce_tests/1.2.1/test_pce.py
   {py3,olm}: nosetests --with-xunit transportpce_tests/1.2.1/test_olm.py
-  {py3,end2end}: nosetests --with-xunit transportpce_tests/1.2.1/test_end2end.py
+  #E2E 1.2.1 moved at the end before 2.2.1 E2E
 #run 2.2.1 functional tests
   {py3,portmapping221}: nosetests --with-xunit transportpce_tests/2.2.1/test_portmapping.py
   {py3,topology221}: nosetests --with-xunit transportpce_tests/2.2.1/test_topology.py
@@ -51,7 +51,8 @@ commands =
   {py3,otnrenderer}: nosetests --with-xunit transportpce_tests/2.2.1/test_otn_renderer.py
   {py3,olm221}: nosetests --with-xunit transportpce_tests/2.2.1/test_olm.py
   {py3,tapi221}: nosetests --with-xunit transportpce_tests/2.2.1/test_tapi.py
-  {py3,end2end221}: nosetests --with-xunit transportpce_tests/2.2.1/test_end2end.py
+  {py3,end2end}: - nosetests --with-xunit transportpce_tests/1.2.1/test_end2end.py
+  {py3,end2end221}: - nosetests --with-xunit transportpce_tests/2.2.1/test_end2end.py
   #{gnpy}: - sudo docker pull atriki/gnpyrest:v1.2
   {gnpy}: - sudo docker run -d -p 8008:5000 --name gnpy_tpce_rest1 atriki/gnpyrest:v1.2
   {gnpy}: nosetests --with-xunit transportpce_tests/1.2.1/test_gnpy.py