X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=34c0aa43d0ab4247cd96c12aa054f27cfee5e3a8;hb=refs%2Fchanges%2F37%2F104137%2F2;hp=34f1def24634f82f30488d916fca6aab48eb8913;hpb=b63b965cb6c94cdd7bc99fad215dbdd5b11bff4a;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index 34f1def24..34c0aa43d 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/
@@ -61,7 +60,7 @@ depends = buildcontroller
 setenv =
     PIP_EXTRA_INDEX_URL = https://gitlab.com/api/v4/projects/33090323/packages/pypi/simple
 #    USE_LIGHTY=True
-    USE_ODL_RESTCONF_VERSION=draft-bierman02
+#    USE_ODL_RESTCONF_VERSION=draft-bierman02
 deps =
   -r{toxinidir}/tests/requirements.txt
   -r{toxinidir}/tests/test-requirements.txt
@@ -92,7 +91,7 @@ whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
-    USE_ODL_RESTCONF_VERSION=draft-bierman02
+#    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
@@ -125,7 +124,7 @@ whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
-    USE_ODL_RESTCONF_VERSION=draft-bierman02
+#    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
@@ -149,7 +148,7 @@ whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
-    USE_ODL_RESTCONF_VERSION=draft-bierman02
+#    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
@@ -157,12 +156,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_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
@@ -175,7 +172,7 @@ whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
-    USE_ODL_RESTCONF_VERSION=draft-bierman02
+#    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
@@ -184,11 +181,11 @@ 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_ODL_RESTCONF_VERSION=draft-bierman02
+#    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
     INSTALL_TAPI=True
@@ -196,6 +193,7 @@ setenv =
     OLM_TIMER2=2000
 
 commands =
+  ./add_tapi_feature_to_tests221.sh
   ./launch_tests.sh tapi {posargs:}
 
 [testenv:with_docker]
@@ -208,7 +206,7 @@ setenv =
     OLM_TIMER2=2000
     INSTALL_TAPI=True
     INSTALL_NBINOTIFICATIONS=True
-    USE_ODL_RESTCONF_VERSION=draft-bierman02
+#    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
@@ -312,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
@@ -325,3 +318,22 @@ deps = gitlint
 commands =
     gitlint --config ../.gitlint
 
+
+[testenv:allure-report-init]
+basepython = python3
+deps = allure-pytest>=2.10.0
+# allure is under Apache License 2.0
+whitelist_externals =
+    mkdir
+    sed
+commands =
+    mkdir -p allure-report
+    sed -i_ '$a\allure-pytest # Apache License 2.0' ./test-requirements.txt
+
+
+[testenv:allure-report-serve]
+basepython = python3
+whitelist_externals =
+    allure
+commands =
+    allure serve "allure-report"