X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=1f624c5abc75ce89ffecb1cc0e93182278a1d064;hb=refs%2Fheads%2Fstable%2Fsulfur;hp=565951c5af4da376b2baabe6307d2844c2d82552;hpb=8583c790d1fec66cecead45413b3dfd65229fb56;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index 565951c5a..1f624c5ab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ setupdir = tests/
 [testenv]
 passenv = USE_LIGHTY 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
 
@@ -60,7 +60,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
@@ -79,7 +79,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 =
@@ -91,7 +91,7 @@ depends = buildcontroller,build_karaf_tests121,sims121,testsPCE
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY 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
@@ -112,7 +112,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 =
@@ -124,7 +124,7 @@ depends = buildcontroller,build_karaf_tests221,sims221,tests71
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY 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
@@ -137,7 +137,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 =
@@ -148,7 +148,7 @@ depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY 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
@@ -157,11 +157,10 @@ commands =
 
 [testenv:build_karaf_tests_hybrid]
 depends = buildcontroller
-# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 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 =
@@ -173,7 +172,8 @@ depends = buildcontroller,build_karaf_tests_hybrid,sims121,sims221,sims71,tests1
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY 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
 commands =
@@ -185,7 +185,7 @@ depends = buildcontroller,build_karaf_tests221,sims221
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY 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
@@ -196,7 +196,7 @@ setenv =
 commands =
   ./launch_tests.sh tapi {posargs:}
 
-[testenv:nbinotifications]
+[testenv:with_docker]
 depends = buildcontroller,sims221
 whitelist_externals = launch_tests.sh
                       dockercmd.sh
@@ -206,10 +206,11 @@ setenv =
     OLM_TIMER2=2000
     INSTALL_TAPI=True
     INSTALL_NBINOTIFICATIONS=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
 
 commands =
   ./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 nbinotifications
+  ./launch_tests.sh with_docker {posargs:}
   ./dockercmd.sh container rm -f tpce_kafka1
 
 [testenv:docs]
@@ -232,7 +233,10 @@ whitelist_externals = sh
                       sudo
                       find
 commands =
-    sh -c 'command checkbashisms>/dev/null || sudo yum install devscripts-minimal || (echo "checkbashisms command not found - please install it (e.g. sudo apt-get install devscripts | yum install devscripts-minimal )" >&2 && exit 1)'
+    sh -c 'command checkbashisms>/dev/null || sudo yum install -y devscripts-checkbashisms || sudo yum install -y devscripts-minimal || sudo yum install -y devscripts \
+        || sudo yum install -y https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/31/Everything/x86_64/os/Packages/d/devscripts-checkbashisms-2.19.6-2.fc31.x86_64.rpm \
+        || (echo "checkbashisms command not found - please install it \
+             (e.g. sudo apt-get install devscripts | yum install devscripts-minimal )" >&2 && exit 1)'
     find . -not -path '*/\.*' -name *.sh -exec checkbashisms -f  \{\} +
 
 [testenv:spelling]