X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=b2976bf5eb1803117aab016d9eb28eba70211eba;hb=1b2f9f488bdd54e577c88c230c4875daccc0b93c;hp=7b18494cec9e6de424b8cf2f586bf5e14005e8aa;hpb=a2f92b4361655d58e7a68d084344322618513855;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index 7b18494ce..b2976bf5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,9 +14,9 @@ skipsdist = true
 setupdir = tests/
 
 [testenv]
-passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OLM_TIMER1 OLM_TIMER2
+passenv = USE_LIGHTY NO_ODL_STARTUP http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OLM_TIMER1 OLM_TIMER2
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
     OLM_TIMER1=3000
     OLM_TIMER2=2000
 
@@ -59,7 +59,7 @@ depends = buildcontroller
 #the following lines retrieve unofficial package of GNPy with REST support from Orange opensource Gitlab repo
 setenv =
     PIP_EXTRA_INDEX_URL = https://gitlab.com/api/v4/projects/33090323/packages/pypi/simple
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
 deps =
   -r{toxinidir}/tests/requirements.txt
@@ -67,7 +67,7 @@ deps =
   setuptools>=7.0
   gnpy4tpce==2.4.7
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION
 basepython = python3
 commands =
   ./launch_tests.sh pce {posargs:}
@@ -78,7 +78,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
@@ -88,9 +88,9 @@ commands =
 depends = buildcontroller,build_karaf_tests121,sims121,testsPCE
 # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
@@ -111,7 +111,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
@@ -121,9 +121,9 @@ commands =
 depends = buildcontroller,build_karaf_tests221,sims221,tests71
 # tests71 dependency is only here to chain tests in the gate and avoid ressources starvation
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
@@ -136,7 +136,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
@@ -145,9 +145,9 @@ commands =
 [testenv:tests71]
 depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
@@ -159,7 +159,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
@@ -169,9 +169,9 @@ commands =
 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
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
@@ -181,10 +181,10 @@ commands =
 
 [testenv:tests_tapi]
 depends = buildcontroller,build_karaf_tests221,sims221
-whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY OLM_TIMER1 OLM_TIMER2 USE_ODL_RESTCONF_VERSION
+whitelist_externals = launch_tests.sh add_tapi_feature_to_tests221.sh
+passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP OLM_TIMER1 OLM_TIMER2 USE_ODL_RESTCONF_VERSION
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
@@ -193,13 +193,14 @@ setenv =
     OLM_TIMER2=2000
 
 commands =
+#  ./add_tapi_feature_to_tests221.sh
   ./launch_tests.sh tapi {posargs:}
 
 [testenv:with_docker]
 depends = buildcontroller,sims221
 whitelist_externals = launch_tests.sh
                       dockercmd.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION OLM_TIMER1 OLM_TIMER2
+passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION OLM_TIMER1 OLM_TIMER2
 setenv =
     OLM_TIMER1=3000
     OLM_TIMER2=2000