fix tox jobs in releng

- maven 3.6.0 no more available from apache repo
  upgrading to 3.6.2
- unforce success in end2end tox jobs

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

diff --git a/tests/installMavenCentOS.sh b/tests/installMavenCentOS.sh
index 34ade73bed36085bfa34b265c2ba82efff2fbf17..a36fcb2703c8f1810aa0ce592dfae33752c07d4a 100755 (executable)
--- a/tests/installMavenCentOS.sh
+++ b/tests/installMavenCentOS.sh
@@ -1,8 +1,8 @@
 #/bin/bash
 
 sudo yum install -y java-1.8.0-openjdk-devel
-wget -nv https://www-us.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz -P /tmp
+wget -nv https://www-us.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz -P /tmp
 sudo mkdir -p /opt
-sudo tar xf /tmp/apache-maven-3.6.0-bin.tar.gz -C /opt
-sudo ln -s /opt/apache-maven-3.6.0 /opt/maven
+sudo tar xf /tmp/apache-maven-3.6.2-bin.tar.gz -C /opt
+sudo ln -s /opt/apache-maven-3.6.2 /opt/maven
 sudo ln -s /opt/maven/bin/mvn /usr/bin/mvn

diff --git a/tox.ini b/tox.ini
index e3474af59cbaa3a132a21ed4f410aed840145d67..6ba2a2ee5c9aeb09b2ff04860e29354f4f0a1f40 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -26,13 +26,13 @@ commands =
   {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
-  {end2end}: - nosetests --with-xunit transportpce_tests/1.2.1/test_end2end.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
-  {end2end221}: - nosetests --with-xunit transportpce_tests/2.2.1/test_end2end.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
   {gnpy}: nosetests --with-xunit transportpce_tests/1.2.1/test_gnpy.py