CI: Prepare tox.ini for new tox version

whitelist_externals is now deprecated in favor of allowlist_externals
https://tox.wiki/en/latest/changelog.html#v4-0-0rc4-2022-12-06

space separator is no longer valid for passenv variable lists
https://tox.wiki/en/latest/changelog.html#v4-0-3-2022-12-08

Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4539
Co-authored-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: If9322889b1d4625f0ddc58966adda92f614887c7
Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/tox.ini b/tox.ini
index b736f8ef23f0703c400f819a63c70cc96df97928..18a849c8c2521d0912a4d28891f01a5e2a348a8b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -16,9 +16,9 @@ skipsdist = true
 setupdir = tests/
 
 [testenv]
-passenv = USE_LIGHTY NO_ODL_STARTUP 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
+#    USE_LIGHTY=True,
     OLM_TIMER1=3000
     OLM_TIMER2=2000
 
@@ -32,19 +32,19 @@ changedir = {toxinidir}/tests
 parallel_show_output = true
 
 [testenv:buildcontroller]
-whitelist_externals = build_controller.sh
+allowlist_externals = build_controller.sh
 commands =
   ./build_controller.sh
 
 [testenv:buildlighty]
-whitelist_externals = build.sh
+allowlist_externals = build.sh
 depends = buildcontroller,tests_hybrid
 changedir = {toxinidir}/lighty
 commands =
   ./build.sh
 
 [testenv:sims121]
-whitelist_externals = install_honeynode.sh
+allowlist_externals = install_honeynode.sh
 depends = buildcontroller
 # sims profiles does not strictly depends on buildcontroller
 # but this dependency avoids race condition in the gate
@@ -52,13 +52,13 @@ commands =
   ./install_honeynode.sh 1.2.1
 
 [testenv:sims221]
-whitelist_externals = install_honeynode.sh
+allowlist_externals = install_honeynode.sh
 depends = buildcontroller
 commands =
   ./install_honeynode.sh 2.2.1
 
 [testenv:sims71]
-whitelist_externals = install_honeynode.sh
+allowlist_externals = install_honeynode.sh
 depends = buildcontroller
 commands =
   ./install_honeynode.sh 7.1
@@ -75,8 +75,8 @@ deps =
   -r{toxinidir}/tests/test-requirements.txt
   setuptools>=7.0
   gnpy4tpce==2.4.7
-whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION
+allowlist_externals = launch_tests.sh
+passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, USE_ODL_RESTCONF_VERSION
 basepython = python3
 commands =
   ./launch_tests.sh pce {posargs:}
@@ -84,8 +84,8 @@ commands =
 [testenv:build_karaf_tests121]
 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
+allowlist_externals = launch_tests.sh
+passenv = LAUNCHER, USE_LIGHTY
 setenv =
 #    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
@@ -96,8 +96,8 @@ commands =
 [testenv:tests121]
 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 NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION
+allowlist_externals = launch_tests.sh
+passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
@@ -117,8 +117,8 @@ commands =
 [testenv:build_karaf_tests221]
 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
+allowlist_externals = launch_tests.sh
+passenv = LAUNCHER, USE_LIGHTY
 setenv =
 #    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
@@ -129,8 +129,8 @@ commands =
 [testenv:tests221]
 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 NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION
+allowlist_externals = launch_tests.sh
+passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
@@ -142,8 +142,8 @@ commands =
 [testenv:build_karaf_tests71]
 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
+allowlist_externals = launch_tests.sh
+passenv = LAUNCHER, USE_LIGHTY
 setenv =
 #    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
@@ -153,8 +153,8 @@ commands =
 
 [testenv:tests71]
 depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
-whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION
+allowlist_externals = launch_tests.sh
+passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
@@ -165,8 +165,8 @@ commands =
 
 [testenv:build_karaf_tests_hybrid]
 depends = buildcontroller
-whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY
+allowlist_externals = launch_tests.sh
+passenv = LAUNCHER, USE_LIGHTY
 setenv =
 #    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
@@ -177,8 +177,8 @@ 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
-whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION
+allowlist_externals = launch_tests.sh
+passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
@@ -190,8 +190,8 @@ commands =
 
 [testenv:tests_tapi]
 depends = buildcontroller,build_karaf_tests221,sims221
-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
+allowlist_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
@@ -207,9 +207,9 @@ commands =
 
 [testenv:with_docker]
 depends = buildcontroller,sims221
-whitelist_externals = launch_tests.sh
+allowlist_externals = launch_tests.sh
                       dockercmd.sh
-passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP 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
@@ -223,21 +223,21 @@ commands =
   ./dockercmd.sh container rm -f tpce_kafka1
 
 [testenv:docs]
-passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+passenv = http_proxy, HTTP_PROXY, https_proxy, HTTPS_PROXY, no_proxy, NO_PROXY
 basepython = python3
 deps = -rdocs/requirements.txt
 commands =
     sphinx-build -q -W --keep-going -b html -n -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/html
 
 [testenv:docs-linkcheck]
-passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+passenv = http_proxy, HTTP_PROXY, https_proxy, HTTPS_PROXY, no_proxy, NO_PROXY
 basepython = python3
 deps = -rdocs/requirements.txt
 commands = sphinx-build -q -b linkcheck -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/linkcheck
 
 [testenv:checkbashisms]
 deps =
-whitelist_externals = sh
+allowlist_externals = sh
                       checkbashisms
                       sudo
                       find
@@ -265,21 +265,21 @@ commands =
 [testenv:pylint_full]
 basepython = python3
 deps = pylint>=2.6.0
-whitelist_externals = find
+allowlist_externals = find
 commands =
     find transportpce_tests/ -name *.py -exec pylint --fail-under=9.22 --max-line-length=120 --disable=missing-docstring --module-rgx="([a-z0-9_]+$)|([0-9.]{1,30}$)" --method-rgx="(([a-z_][a-zA-Z0-9_]{2,})|(_[a-z0-9_]*)|(__[a-zA-Z][a-zA-Z0-9_]+__))$" --variable-rgx="[a-zA-Z_][a-zA-Z0-9_]{1,30}$" --reports=y --score=y  --output-format=colorized  \{\} +
 
 [testenv:pylint]
 basepython = python3
 deps = pylint>=2.6.0
-whitelist_externals = find
+allowlist_externals = find
 commands =
     find transportpce_tests/ -name *.py -exec pylint --fail-under=10 --max-line-length=120 --disable=missing-docstring --disable=fixme --disable=duplicate-code --module-rgx="([a-z0-9_]+$)|([0-9.]{1,30}$)" --method-rgx="(([a-z_][a-zA-Z0-9_]{2,})|(_[a-z0-9_]*)|(__[a-zA-Z][a-zA-Z0-9_]+__))$" --variable-rgx="[a-zA-Z_][a-zA-Z0-9_]{1,30}$" \{\} +
 
 [testenv:pyang]
 basepython = python3
 deps = pyang
-whitelist_externals = find
+allowlist_externals = find
 commands =
     pyang --version
     find ../api/ -name target -prune -o -name *.yang -exec pyang --lint --canonical --max-line-length=120 -p../api/src/main/yang/:../ordmodels/common/src/main/yang/:../ordmodels/service/src/main/yang/:../tapimodels/src/main/yang/ \{\} +
@@ -288,7 +288,7 @@ commands =
 [testenv:pyangformat]
 basepython = python3
 deps = pyang
-whitelist_externals = sh
+allowlist_externals = sh
 commands =
     pyang --version
     sh -c 'find ../api/ -name target -prune -o -name *.yang -print | while read -r fname; do pyang -f yang --yang-canonical --yang-remove-unused-imports --max-line-length=120 --keep-comments -p../api/src/main/yang/:../ordmodels/common/src/main/yang/:../ordmodels/service/src/main/yang/:../tapimodels/src/main/yang/ "$fname"  -o /tmp/tmpfile.$$ && mv /tmp/tmpfile.$$ "$fname";done'
@@ -332,7 +332,7 @@ commands =
 basepython = python3
 deps = allure-pytest>=2.10.0
 # allure is under Apache License 2.0
-whitelist_externals =
+allowlist_externals =
     mkdir
     sed
 commands =
@@ -342,7 +342,7 @@ commands =
 
 [testenv:allure-report-serve]
 basepython = python3
-whitelist_externals =
+allowlist_externals =
     allure
 commands =
     allure serve "allure-report"