X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=1c3d9abf60064b2383c4f818b7bf81267b86bf3e;hb=6d5910374c0dfc44a2448adc06e81b6d7ab9ff18;hp=df7ce3b8ac6fd3f3c3a2e01877862aeed0dad409;hpb=1a52f06f2d7856eba140391b11e03955c09aa8dd;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index df7ce3b8a..1c3d9abf6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -63,24 +63,27 @@ commands =
   ./build.sh
 
 [testenv:sims121]
-allowlist_externals = install_honeynode.sh
+passenv = USE_SIMS
+allowlist_externals = install_sims.sh
 depends = buildcontroller
 # sims profiles does not strictly depends on buildcontroller
 # but this dependency avoids race condition in the gate
 commands =
-  ./install_honeynode.sh 1.2.1
+  ./install_sims.sh 1.2.1
 
 [testenv:sims221]
-allowlist_externals = install_honeynode.sh
+passenv = USE_SIMS
+allowlist_externals = install_sims.sh
 depends = buildcontroller
 commands =
-  ./install_honeynode.sh 2.2.1
+  ./install_sims.sh 2.2.1
 
 [testenv:sims71]
-allowlist_externals = install_honeynode.sh
+passenv = USE_SIMS
+allowlist_externals = install_sims.sh
 depends = buildcontroller
 commands =
-  ./install_honeynode.sh 7.1
+  ./install_sims.sh 7.1
 
 [testenv:testsPCE]
 depends = buildcontroller
@@ -199,18 +202,19 @@ commands =
 
 [testenv:tests71]
 depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
-allowlist_externals = launch_tests.sh
+allowlist_externals = launch_tests.sh install_honeynode.sh
 passenv = LAUNCHER
     USE_LIGHTY
-    USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_SIMS=honeynode
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
+  ./install_honeynode.sh 7.1
   ./launch_tests.sh 7.1 {posargs:}
 
 [testenv:build_karaf_tests_hybrid]
@@ -227,24 +231,27 @@ commands =
 [testenv:tests_hybrid]
 depends = buildcontroller,build_karaf_tests_hybrid,sims121,sims221,sims71,tests121,tests221,tests71
 #the last dependency is to avoid temporarily concurrent ressources problem in parallel mode
-allowlist_externals = launch_tests.sh
+allowlist_externals = launch_tests.sh install_honeynode.sh
 passenv = LAUNCHER
     USE_LIGHTY
     USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 setenv =
+    USE_SIMS=honeynode
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
 #  nosetests --with-xunit transportpce_tests/hybrid/test01_device_change_notifications.py
+  ./install_honeynode.sh
   ./launch_tests.sh hybrid {posargs:}
 
 [testenv:tests_tapi]
 depends = buildcontroller,build_karaf_tests221,sims221
-allowlist_externals = launch_tests.sh add_tapi_feature_to_tests221.sh
+allowlist_externals = launch_tests.sh
+#                      add_tapi_feature_to_tests221.sh
 passenv = LAUNCHER
     USE_LIGHTY
     USE_SIMS
@@ -263,20 +270,19 @@ setenv =
 
 commands =
 #  ./add_tapi_feature_to_tests221.sh
--  ./launch_tests.sh tapi {posargs:}
+  ./launch_tests.sh tapi {posargs:}
 
 [testenv:with_docker]
 depends = buildcontroller,sims221
-allowlist_externals = launch_tests.sh
-                      dockercmd.sh
+allowlist_externals = launch_tests.sh dockercmd.sh install_honeynode.sh
 passenv = LAUNCHER
     USE_LIGHTY
-    USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 #    OLM_TIMER1
 #    OLM_TIMER2
 setenv =
+    USE_SIMS=honeynode
     OLM_TIMER1=3000
     OLM_TIMER2=2000
     INSTALL_TAPI=True
@@ -284,6 +290,7 @@ setenv =
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
 
 commands =
+  ./install_honeynode.sh 2.2.1
   ./dockercmd.sh run -d -p 2181:2181 -p 9092:9092 --env ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092 --name tpce_kafka1 teivah/kafka:2.0.0
   ./launch_tests.sh with_docker {posargs:}
   ./dockercmd.sh container rm -f tpce_kafka1