X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=82315a4a68cd72fb75b378a45024856f5caf3114;hb=980555a7d2dc492570012d813e5fa14253597233;hp=be29d12ceec8ed3b651fd200a103e2f9f5cef6d2;hpb=d3f738ebc8fb5f7501cde960cd887f115cd96eba;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index be29d12ce..82315a4a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setupdir = tests/
 [testenv]
 passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 setenv =
-    USE_LIGHTY = True
+    USE_LIGHTY=True
 usedevelop = true
 basepython = python3
 deps =
@@ -23,65 +23,54 @@ changedir = {toxinidir}/tests
 parallel_show_output = true
 
 [testenv:buildcontroller]
-whitelist_externals = sh
-                      sudo
+whitelist_externals = build_controller.sh
 commands =
-#install maven and JDK11 on the Gate since they are not there by default
-  sh -c "which mvn >/dev/null || ./installMavenCentOS.sh"
-#install honeynode 1.2.1 simulators
-#patch OLM constant to speed up tests, unnecessary for PCE tests
-  sh -c "sed -i'_' 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java"
-#build controller, source JDK_JAVA_OPTIONS to remove illegal reflective acces warnings introduced by Java11
-  sh -c ". $PWD/reflectwarn.sh && cd .. && mvn clean install -B -q -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true -Dodlparent.spotbugs.skip -Dodlparent.checkstyle.skip"
-  sh -c "mv  ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java_  ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java"
-#patch Karaf exec for the same reason at runtime
-  sh -c "sed -i'_' 's@!/bin/sh@!/bin/sh\'$'\n. $(dirname $0)/../../../../tests/reflectwarn.sh@' ../karaf/target/assembly/bin/karaf"
-  # the following command would be the straight and right way to support both BSD and GNU sed versions
-  # sh -c "sed -i'_' '1 a\'$'\n. \$(dirname \$0)/\.\./\.\./\.\./\.\./tests/reflectwarn.sh\n' ../karaf/target/assembly/bin/karaf"
-  # but tox reinterprets the quotes as
-  # sh -c 'sed -i'"'"'_'"'"' '"'"'1 a\'"'"'$'"'"'\n. \$(dirname \$0)/\.\./\.\./\.\./\.\./tests/reflectwarn.sh\n'"'"' ../karaf/target/assembly/bin/karaf'
-  # ,what results in an unexpected different formating (with a $ on the second line and the dot on the third)
-#build Lighty if needed
-  sh -c 'if [ "$USE_LIGHTY" = "True" ]; then (cd ../lighty && ./build.sh); fi'
+  ./build_controller.sh
 
 [testenv:sims121]
-whitelist_externals = sh
+whitelist_externals = install_honeynode.sh
 depends = buildcontroller
 # sims profiles does not strictly depends on buildcontroller
 # but this dependency avoids race condition in the gate
 commands =
-  - sh -c "./install_honeynode.sh 1.2.1"
+  ./install_honeynode.sh 1.2.1
 
 [testenv:sims221]
-whitelist_externals = sh
+whitelist_externals = install_honeynode.sh
 depends = buildcontroller
 commands =
-  - sh -c "./install_honeynode.sh 2.2.1"
+  ./install_honeynode.sh 2.2.1
 
 [testenv:sims71]
-whitelist_externals = sh
+whitelist_externals = install_honeynode.sh
 depends = buildcontroller
 commands =
-  - sh -c "./install_honeynode.sh 7.1"
+  ./install_honeynode.sh 7.1
 
 [testenv:testsPCE]
 depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
+setenv =
+    USE_LIGHTY=True
 commands =
   ./launch_tests.sh pce {posargs:}
 
 [testenv:tests121]
 depends = buildcontroller,sims121,testsPCE
-#the last dependency is to avoid temporarily concurrent ressources problem to fix in parallel mode
+# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER
+passenv = LAUNCHER USE_LIGHTY
 setenv =
     USE_LIGHTY=True
-    USE_ODL_ALT_RESTCONF_PORT=8182
     USE_ODL_ALT_WEBSOCKET_PORT=8186
     USE_ODL_ALT_AKKA_PORT=2551
     USE_ODL_ALT_AKKA_MGT_PORT=8559
+    USE_ODL_ALT_SHELL_PORT=8102
+    USE_ODL_ALT_RMI_REGISTRY_PORT=1100
+    USE_ODL_ALT_RMI_SERVER_PORT=44445
+    USE_ODL_ALT_RESTCONF_PORT=8182
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
   ./launch_tests.sh 1.2.1 {posargs:}
 # By default, all tests in the folder transportpce_tests/1.2.1/ are run.
@@ -94,44 +83,55 @@ commands =
 # files attributes.
 
 [testenv:tests221]
-depends = buildcontroller,sims221,tests121
-#the last dependency is to avoid temporarily concurrent ressources problem to fix in parallel mode
+depends = buildcontroller,sims221,tests71
+# tests71 dependency is only here to chain tests in the gate and avoid ressources starvation
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER
+passenv = LAUNCHER USE_LIGHTY
 setenv =
     USE_LIGHTY=True
-    USE_ODL_ALT_RESTCONF_PORT=8183
     USE_ODL_ALT_WEBSOCKET_PORT=8187
     USE_ODL_ALT_AKKA_PORT=2552
     USE_ODL_ALT_AKKA_MGT_PORT=8560
+    USE_ODL_ALT_SHELL_PORT=8103
+    USE_ODL_ALT_RMI_REGISTRY_PORT=1101
+    USE_ODL_ALT_RMI_SERVER_PORT=44446
+    USE_ODL_ALT_RESTCONF_PORT=8183
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
   ./launch_tests.sh 2.2.1 {posargs:}
 
 [testenv:tests71]
-depends = buildcontroller,sims71,tests221
-#the last dependency is to avoid temporarily concurrent ressources problem to fix in parallel mode
+depends = buildcontroller,sims71
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER
+passenv = LAUNCHER USE_LIGHTY
 setenv =
     USE_LIGHTY=True
-    USE_ODL_ALT_RESTCONF_PORT=8184
     USE_ODL_ALT_WEBSOCKET_PORT=8188
     USE_ODL_ALT_AKKA_PORT=2553
     USE_ODL_ALT_AKKA_MGT_PORT=8561
+    USE_ODL_ALT_SHELL_PORT=8104
+    USE_ODL_ALT_RMI_REGISTRY_PORT=1102
+    USE_ODL_ALT_RMI_SERVER_PORT=44447
+    USE_ODL_ALT_RESTCONF_PORT=8184
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
   ./launch_tests.sh 7.1 {posargs:}
 
 [testenv:tests_hybrid]
 depends = buildcontroller,sims121,sims221,sims71,tests121,tests221,tests71
-#the last dependency is to avoid temporarily concurrent ressources problem to fix in parallel mode
+#the last dependency is to avoid temporarily concurrent ressources problem in parallel mode
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER
+passenv = LAUNCHER USE_LIGHTY
 setenv =
     USE_LIGHTY=True
-    USE_ODL_ALT_RESTCONF_PORT=8182
     USE_ODL_ALT_WEBSOCKET_PORT=8186
     USE_ODL_ALT_AKKA_PORT=2551
     USE_ODL_ALT_AKKA_MGT_PORT=8559
+    USE_ODL_ALT_SHELL_PORT=8102
+    USE_ODL_ALT_RMI_REGISTRY_PORT=1100
+    USE_ODL_ALT_RMI_SERVER_PORT=44445
+    USE_ODL_ALT_RESTCONF_PORT=8182
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
 #  nosetests --with-xunit transportpce_tests/hybrid/test01_device_change_notifications.py
   ./launch_tests.sh hybrid {posargs:}
@@ -140,19 +140,21 @@ commands =
 depends = buildcontroller
 whitelist_externals = sh
                       sudo
+passenv = LAUNCHER USE_LIGHTY
 commands =
   #sudo docker pull atriki/gnpyrest:v1.2
   sudo docker run -d -p 8008:5000 --name gnpy_tpce_rest1 atriki/gnpyrest:v1.2
-  nosetests --with-xunit transportpce_tests/with_docker/test_gnpy.py
+  ./launch_tests.sh with_docker gnpy
   sudo docker container rm -f gnpy_tpce_rest1
 
 [testenv:nbinotifications]
 depends = buildcontroller,sims221
 whitelist_externals = sh
                       sudo
+passenv = LAUNCHER USE_LIGHTY
 commands =
   sudo docker-compose -f ./nbinotifications/docker-compose.yml up -d
-  nosetests --with-xunit transportpce_tests/with_docker/test_nbinotifications.py
+  ./launch_tests.sh with_docker nbinotifications
   sudo docker-compose -f ./nbinotifications/docker-compose.yml down --rmi all
 
 [testenv:docs]