Refactor tox.ini

- use one variable per line for tox3 support One variable is the only syntax supported by both tox3 and tox4. https: //tox.wiki/en/4.0.3/faq.html#tox-4-changed-ini-rules tox-dev/tox#2658 Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com> Change-Id: I7db5c9492ea28b4265fd0a126efe9137417d9a35
opendaylight · Oct 13, 2023 · b6a8d22 · b6a8d22
1 parent eae8db3
commit b6a8d22
Showing 1 changed file with 90 additions and 22 deletions.
diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,20 @@
 [tox]
 minversion = 3.7.0
 envlist = buildcontroller
-     testsPCE,
-     sims121,build_karaf_tests121,tests121,
-     sims221,build_karaf_tests221,tests_tapi,tests221,
-     sims71,build_karaf_tests71,tests71,
-     build_karaf_tests_hybrid,tests_hybrid,
-     buildlighty,
+     testsPCE
+     sims121
+     build_karaf_tests121
+     tests121
+     sims221
+     build_karaf_tests221
+     tests_tapi
+     tests221
+     sims71
+     build_karaf_tests71
+     tests71
+     build_karaf_tests_hybrid
+     tests_hybrid
+     buildlighty
      docs
      docs-linkcheck
      checkbashisms
@@ -16,7 +24,17 @@ 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 = LAUNCHER
+     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
@@ -76,7 +94,10 @@ deps =
   setuptools>=7.0
   gnpy4tpce==2.4.7
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, USE_ODL_RESTCONF_VERSION
+passenv = LAUNCHER
+    USE_LIGHTY
+    NO_ODL_STARTUP
+    USE_ODL_RESTCONF_VERSION
 basepython = python3
 commands =
   ./launch_tests.sh pce {posargs:}
@@ -85,7 +106,7 @@ commands =
 depends = buildcontroller
 # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY
+passenv = USE_LIGHTY
 setenv =
 #    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
@@ -97,7 +118,10 @@ commands =
 depends = buildcontroller,build_karaf_tests121,sims121,testsPCE
 # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, 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
@@ -118,19 +142,39 @@ commands =
 depends = buildcontroller
 # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY
+passenv = USE_LIGHTY
 setenv =
 #    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
   ./build_karaf_for_tests.sh
 
+[testenv:launch]
+depends = buildcontroller,build_karaf_tests221,sims,tests71
+# tests71 dependency is only here to chain tests in the gate and avoid ressources starvation
+allowlist_externals = launch.sh
+passenv = LAUNCHER
+    USE_LIGHTY
+    NO_ODL_STARTUP
+    USE_ODL_RESTCONF_VERSION
+setenv =
+#    USE_LIGHTY=True
+#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_ODL_ALT_KARAF_ENV=./karaf221.env
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
+commands =
+  ./launch.sh
+
+
 [testenv:tests221]
 depends = buildcontroller,build_karaf_tests221,sims221,tests71
 # tests71 dependency is only here to chain tests in the gate and avoid ressources starvation
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, 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
@@ -143,7 +187,7 @@ commands =
 depends = buildcontroller
 # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY
+passenv = USE_LIGHTY
 setenv =
 #    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
@@ -154,7 +198,10 @@ commands =
 [testenv:tests71]
 depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, 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
@@ -166,7 +213,7 @@ commands =
 [testenv:build_karaf_tests_hybrid]
 depends = buildcontroller
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY
+passenv = USE_LIGHTY
 setenv =
 #    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
@@ -178,7 +225,10 @@ 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
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY, NO_ODL_STARTUP, 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
@@ -191,7 +241,12 @@ commands =
 [testenv:tests_tapi]
 depends = buildcontroller,build_karaf_tests221,sims221
 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
+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
@@ -209,7 +264,12 @@ commands =
 depends = buildcontroller,sims221
 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,14 +283,24 @@ 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
@@ -327,7 +397,6 @@ deps = gitlint
 commands =
     gitlint --config ../.gitlint
 
-
 [testenv:allure-report-init]
 basepython = python3
 deps = allure-pytest>=2.10.0
@@ -339,7 +408,6 @@ commands =
     mkdir -p allure-report
     sed -i_ '$a\allure-pytest # Apache License 2.0' ./test-requirements.txt
 
-
 [testenv:allure-report-serve]
 basepython = python3
 allowlist_externals =