Merge "Bump transportpce-models upstream dependency"

[transportpce.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 2f79e58107334b5b0ea2c5728aabdd4fbc3aa29e..73f3460ee563f51e23f57e900dcf715b554608d7 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -60,7 +60,7 @@ allowlist_externals = build.sh
 depends = buildcontroller,tests_hybrid
 changedir = {toxinidir}/lighty
 commands =
-  ./build.sh
+  - ./build.sh
 
 [testenv:sims]
 passenv = USE_SIMS
@@ -209,19 +209,18 @@ commands =
 
 [testenv:tests71]
 depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
-allowlist_externals = launch_tests.sh install_honeynode.sh
+allowlist_externals = launch_tests.sh
 passenv = LAUNCHER
     USE_LIGHTY
+    USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
-    USE_SIMS=honeynode
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
-  ./install_honeynode.sh 7.1
   ./launch_tests.sh 7.1 {posargs:}
 
 [testenv:build_karaf_tests_hybrid]
@@ -238,21 +237,19 @@ commands =
 [testenv:tests_hybrid]
 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
-allowlist_externals = launch_tests.sh install_honeynode.sh
+allowlist_externals = launch_tests.sh
 passenv = LAUNCHER
     USE_LIGHTY
     USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 setenv =
-    USE_SIMS=honeynode
 #    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 =
 #  nosetests --with-xunit transportpce_tests/hybrid/test01_device_change_notifications.py
-  ./install_honeynode.sh
   ./launch_tests.sh hybrid {posargs:}
 
 [testenv:tests_tapi]
@@ -281,15 +278,15 @@ commands =
 
 [testenv:with_docker]
 depends = buildcontroller,sims221
-allowlist_externals = launch_tests.sh dockercmd.sh install_honeynode.sh
+allowlist_externals = launch_tests.sh dockercmd.sh
 passenv = LAUNCHER
     USE_LIGHTY
+    USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 #    OLM_TIMER1
 #    OLM_TIMER2
 setenv =
-    USE_SIMS=honeynode
     OLM_TIMER1=3000
     OLM_TIMER2=2000
     INSTALL_TAPI=True
@@ -297,7 +294,6 @@ setenv =
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
 
 commands =
-  ./install_honeynode.sh 2.2.1
   ./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 {posargs:}
   ./dockercmd.sh container rm -f tpce_kafka1
@@ -407,7 +403,14 @@ commands =
 basepython = python3
 deps = pre-commit
 passenv = HOME
+allowlist_externals = sh
+                      cpan
+                      sudo
+                      which
 commands =
+    sh -c 'which cpan || sudo yum install -y perl-CPAN  \
+        || (echo "cpan command not found - please install it \
+             (e.g. sudo apt-get install perl-modules | yum install perl-CPAN )" >&2 && exit 1)'
     pre-commit run --all-files --show-diff-on-failure
     pre-commit run gitlint-ci --hook-stage manual