X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=tox.ini;h=4911701c8e4ac8a38ebfe02cadb3ac0bc451a559;hb=5d00ae0e5a66e825b558d874f7a8bb75f4f2c812;hp=3baf8b2587b76abeaa1b543df217d39e08e8d237;hpb=1738b9acf35017603fdc53e4e3b65578c0a4b8e9;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index 3baf8b258..4911701c8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,6 @@ envlist = buildcontroller,testsPCE,
     docs-linkcheck
     checkbashisms
     pre-commit
-    gitlint
     pylint
 skipsdist = true
 setupdir = tests/
@@ -17,7 +16,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 +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
@@ -79,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 =
@@ -91,7 +90,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 +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 =
@@ -124,7 +123,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 +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 =
@@ -148,7 +147,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
@@ -160,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 =
@@ -172,7 +171,7 @@ 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
@@ -182,10 +181,10 @@ commands =
 
 [testenv:tests_tapi]
 depends = buildcontroller,build_karaf_tests221,sims221
-whitelist_externals = launch_tests.sh
+whitelist_externals = launch_tests.sh add_tapi_feature_to_tests221.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
@@ -194,6 +193,7 @@ setenv =
     OLM_TIMER2=2000
 
 commands =
+  ./add_tapi_feature_to_tests221.sh
   ./launch_tests.sh tapi {posargs:}
 
 [testenv:with_docker]
@@ -310,12 +310,7 @@ deps = pre-commit
 passenv = HOME
 commands =
     pre-commit run --all-files --show-diff-on-failure
-    pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG
-    # Gitlint only proposes a pre-commit configuration for the commit-msg stage but none for the commit stage.
-    # Its default arguments --passed and --msg-filename are different from CI recommandations.
-    # As a result, the line above is always skipped in jenkins CI since there cannot be a .git/COMMIT_EDITMSG file.
-    # A dedicated gitlint profile for CI is proposed below. Also to behave fine locally, this profile must have access
-    # to the HOME variable so that Gitlint can retrieve Git user settings.
+    pre-commit run gitlint-ci --hook-stage manual
 
 [testenv:gitlint]
 basepython = python3