X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=b2976bf5eb1803117aab016d9eb28eba70211eba;hb=261f1ac363e9f28158aecf64499b783f69caaf9d;hp=3baf8b2587b76abeaa1b543df217d39e08e8d237;hpb=bfb25e2820cf2f2fc5c88b5b803bc6a13711317e;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index 3baf8b258..b2976bf5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,13 +9,12 @@ envlist = buildcontroller,testsPCE,
     docs-linkcheck
     checkbashisms
     pre-commit
-    gitlint
     pylint
 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
     OLM_TIMER1=3000
@@ -68,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:}
@@ -89,7 +88,7 @@ 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_ODL_RESTCONF_VERSION=draft-bierman02
@@ -122,7 +121,7 @@ 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_ODL_RESTCONF_VERSION=draft-bierman02
@@ -146,7 +145,7 @@ 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_ODL_RESTCONF_VERSION=draft-bierman02
@@ -170,7 +169,7 @@ 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_ODL_RESTCONF_VERSION=draft-bierman02
@@ -182,8 +181,8 @@ 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_ODL_RESTCONF_VERSION=draft-bierman02
@@ -194,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
@@ -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