Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix CI Cent OS 8 configuration issue (workaround)
[transportpce.git]
/
tox.ini
diff --git
a/tox.ini
b/tox.ini
index b736f8ef23f0703c400f819a63c70cc96df97928..e85022a1411699b33b0acadf232d40f4d8c58d34 100644
(file)
--- a/
tox.ini
+++ b/
tox.ini
@@
-1,12
+1,21
@@
[tox]
minversion = 3.7.0
[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,
+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
docs
docs-linkcheck
checkbashisms
docs
docs-linkcheck
checkbashisms
@@
-16,9
+25,20
@@
skipsdist = true
setupdir = tests/
[testenv]
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
+ USE_SIMS
+ NO_ODL_STARTUP
+ http_proxy
+ HTTP_PROXY
+ https_proxy
+ HTTPS_PROXY
+ no_proxy
+ NO_PROXY
+ OLM_TIMER1
+ OLM_TIMER2
setenv =
setenv =
-# USE_LIGHTY=True
+# USE_LIGHTY=True
,
OLM_TIMER1=3000
OLM_TIMER2=2000
OLM_TIMER1=3000
OLM_TIMER2=2000
@@
-32,36
+52,46
@@
changedir = {toxinidir}/tests
parallel_show_output = true
[testenv:buildcontroller]
parallel_show_output = true
[testenv:buildcontroller]
-
white
list_externals = build_controller.sh
+
allow
list_externals = build_controller.sh
commands =
./build_controller.sh
[testenv:buildlighty]
commands =
./build_controller.sh
[testenv:buildlighty]
-
white
list_externals = build.sh
+
allow
list_externals = build.sh
depends = buildcontroller,tests_hybrid
changedir = {toxinidir}/lighty
commands =
./build.sh
depends = buildcontroller,tests_hybrid
changedir = {toxinidir}/lighty
commands =
./build.sh
+[testenv:sims]
+passenv = USE_SIMS
+allowlist_externals = install_lightynode.sh
+depends = buildcontroller
+commands =
+ ./install_lightynode.sh {posargs:}
+
[testenv:sims121]
[testenv:sims121]
-whitelist_externals = install_honeynode.sh
+passenv = USE_SIMS
+allowlist_externals = install_sims.sh
depends = buildcontroller
# sims profiles does not strictly depends on buildcontroller
# but this dependency avoids race condition in the gate
commands =
depends = buildcontroller
# sims profiles does not strictly depends on buildcontroller
# but this dependency avoids race condition in the gate
commands =
- ./install_
honeynode
.sh 1.2.1
+ ./install_
sims
.sh 1.2.1
[testenv:sims221]
[testenv:sims221]
-whitelist_externals = install_honeynode.sh
+passenv = USE_SIMS
+allowlist_externals = install_sims.sh
depends = buildcontroller
commands =
depends = buildcontroller
commands =
- ./install_
honeynode
.sh 2.2.1
+ ./install_
sims
.sh 2.2.1
[testenv:sims71]
[testenv:sims71]
-whitelist_externals = install_honeynode.sh
+passenv = USE_SIMS
+allowlist_externals = install_sims.sh
depends = buildcontroller
commands =
depends = buildcontroller
commands =
- ./install_
honeynode
.sh 7.1
+ ./install_
sims
.sh 7.1
[testenv:testsPCE]
depends = buildcontroller
[testenv:testsPCE]
depends = buildcontroller
@@
-75,8
+105,11
@@
deps =
-r{toxinidir}/tests/test-requirements.txt
setuptools>=7.0
gnpy4tpce==2.4.7
-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:}
basepython = python3
commands =
./launch_tests.sh pce {posargs:}
@@
-84,8
+117,8
@@
commands =
[testenv:build_karaf_tests121]
depends = buildcontroller
# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
[testenv:build_karaf_tests121]
depends = buildcontroller
# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
-
white
list_externals = launch_tests.sh
-passenv =
LAUNCHER
USE_LIGHTY
+
allow
list_externals = launch_tests.sh
+passenv = USE_LIGHTY
setenv =
# USE_LIGHTY=True
USE_ODL_ALT_KARAF_ENV=./karaf121.env
setenv =
# USE_LIGHTY=True
USE_ODL_ALT_KARAF_ENV=./karaf121.env
@@
-96,8
+129,11
@@
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
[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
+ USE_SIMS
+ USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
# USE_ODL_RESTCONF_VERSION=draft-bierman02
setenv =
# USE_LIGHTY=True
# USE_ODL_RESTCONF_VERSION=draft-bierman02
@@
-117,8
+153,8
@@
commands =
[testenv:build_karaf_tests221]
depends = buildcontroller
# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
[testenv:build_karaf_tests221]
depends = buildcontroller
# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
-
white
list_externals = launch_tests.sh
-passenv =
LAUNCHER
USE_LIGHTY
+
allow
list_externals = launch_tests.sh
+passenv = USE_LIGHTY
setenv =
# USE_LIGHTY=True
USE_ODL_ALT_KARAF_ENV=./karaf221.env
setenv =
# USE_LIGHTY=True
USE_ODL_ALT_KARAF_ENV=./karaf221.env
@@
-126,11
+162,32
@@
setenv =
commands =
./build_karaf_for_tests.sh
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
[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
+ USE_SIMS
+ NO_ODL_STARTUP
+ USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
# USE_ODL_RESTCONF_VERSION=draft-bierman02
setenv =
# USE_LIGHTY=True
# USE_ODL_RESTCONF_VERSION=draft-bierman02
@@
-142,8
+199,8
@@
commands =
[testenv:build_karaf_tests71]
depends = buildcontroller
# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
[testenv:build_karaf_tests71]
depends = buildcontroller
# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
-
white
list_externals = launch_tests.sh
-passenv =
LAUNCHER
USE_LIGHTY
+
allow
list_externals = launch_tests.sh
+passenv = USE_LIGHTY
setenv =
# USE_LIGHTY=True
USE_ODL_ALT_KARAF_ENV=./karaf71.env
setenv =
# USE_LIGHTY=True
USE_ODL_ALT_KARAF_ENV=./karaf71.env
@@
-153,8
+210,12
@@
commands =
[testenv:tests71]
depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
[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
+ USE_SIMS
+ NO_ODL_STARTUP
+ USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
# USE_ODL_RESTCONF_VERSION=draft-bierman02
setenv =
# USE_LIGHTY=True
# USE_ODL_RESTCONF_VERSION=draft-bierman02
@@
-165,8
+226,8
@@
commands =
[testenv:build_karaf_tests_hybrid]
depends = buildcontroller
[testenv:build_karaf_tests_hybrid]
depends = buildcontroller
-
white
list_externals = launch_tests.sh
-passenv =
LAUNCHER
USE_LIGHTY
+
allow
list_externals = launch_tests.sh
+passenv = USE_LIGHTY
setenv =
# USE_LIGHTY=True
USE_ODL_ALT_KARAF_ENV=./karaf121.env
setenv =
# USE_LIGHTY=True
USE_ODL_ALT_KARAF_ENV=./karaf121.env
@@
-177,8
+238,12
@@
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
[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
+ USE_SIMS
+ NO_ODL_STARTUP
+ USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
# USE_ODL_RESTCONF_VERSION=draft-bierman02
setenv =
# USE_LIGHTY=True
# USE_ODL_RESTCONF_VERSION=draft-bierman02
@@
-190,8
+255,15
@@
commands =
[testenv:tests_tapi]
depends = buildcontroller,build_karaf_tests221,sims221
[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
+ USE_SIMS
+ NO_ODL_STARTUP
+ OLM_TIMER1
+ OLM_TIMER2
+ USE_ODL_RESTCONF_VERSION
setenv =
# USE_LIGHTY=True
# USE_ODL_RESTCONF_VERSION=draft-bierman02
setenv =
# USE_LIGHTY=True
# USE_ODL_RESTCONF_VERSION=draft-bierman02
@@
-207,9
+279,14
@@
commands =
[testenv:with_docker]
depends = buildcontroller,sims221
[testenv:with_docker]
depends = buildcontroller,sims221
-whitelist_externals = launch_tests.sh
- dockercmd.sh
-passenv = LAUNCHER USE_LIGHTY NO_ODL_STARTUP USE_ODL_RESTCONF_VERSION OLM_TIMER1 OLM_TIMER2
+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 =
OLM_TIMER1=3000
OLM_TIMER2=2000
setenv =
OLM_TIMER1=3000
OLM_TIMER2=2000
@@
-223,25
+300,37
@@
commands =
./dockercmd.sh container rm -f tpce_kafka1
[testenv:docs]
./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]
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 =
basepython = python3
deps = -rdocs/requirements.txt
commands = sphinx-build -q -b linkcheck -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/linkcheck
[testenv:checkbashisms]
deps =
-
white
list_externals = sh
+
allow
list_externals = sh
checkbashisms
sudo
find
checkbashisms
sudo
find
+ fixCIcentOS8reposMirrors.sh
commands =
commands =
+ ./fixCIcentOS8reposMirrors.sh
sh -c 'command checkbashisms>/dev/null || sudo yum install -y devscripts-checkbashisms || sudo yum install -y devscripts-minimal || sudo yum install -y devscripts \
|| sudo yum install -y https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/31/Everything/x86_64/os/Packages/d/devscripts-checkbashisms-2.19.6-2.fc31.x86_64.rpm \
|| (echo "checkbashisms command not found - please install it \
sh -c 'command checkbashisms>/dev/null || sudo yum install -y devscripts-checkbashisms || sudo yum install -y devscripts-minimal || sudo yum install -y devscripts \
|| sudo yum install -y https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/31/Everything/x86_64/os/Packages/d/devscripts-checkbashisms-2.19.6-2.fc31.x86_64.rpm \
|| (echo "checkbashisms command not found - please install it \
@@
-265,21
+354,21
@@
commands =
[testenv:pylint_full]
basepython = python3
deps = pylint>=2.6.0
[testenv:pylint_full]
basepython = python3
deps = pylint>=2.6.0
-
white
list_externals = find
+
allow
list_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
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
-
white
list_externals = find
+
allow
list_externals = find
commands =
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}$" \{\} +
+ find transportpce_tests/ -name *.py -exec pylint --fail-under=10 --max-line-length=120 --disable=missing-docstring
,import-error
--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
[testenv:pyang]
basepython = python3
deps = pyang
-
white
list_externals = find
+
allow
list_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/ \{\} +
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
+377,7
@@
commands =
[testenv:pyangformat]
basepython = python3
deps = pyang
[testenv:pyangformat]
basepython = python3
deps = pyang
-
white
list_externals = sh
+
allow
list_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'
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'
@@
-317,7
+406,16
@@
commands =
basepython = python3
deps = pre-commit
passenv = HOME
basepython = python3
deps = pre-commit
passenv = HOME
+allowlist_externals = sh
+ cpan
+ sudo
+ which
+ fixCIcentOS8reposMirrors.sh
commands =
commands =
+ ./fixCIcentOS8reposMirrors.sh
+ 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
pre-commit run --all-files --show-diff-on-failure
pre-commit run gitlint-ci --hook-stage manual
@@
-327,22
+425,20
@@
deps = gitlint
commands =
gitlint --config ../.gitlint
commands =
gitlint --config ../.gitlint
-
[testenv:allure-report-init]
basepython = python3
deps = allure-pytest>=2.10.0
# allure is under Apache License 2.0
[testenv:allure-report-init]
basepython = python3
deps = allure-pytest>=2.10.0
# allure is under Apache License 2.0
-
white
list_externals =
+
allow
list_externals =
mkdir
sed
commands =
mkdir -p allure-report
sed -i_ '$a\allure-pytest # Apache License 2.0' ./test-requirements.txt
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
[testenv:allure-report-serve]
basepython = python3
-
white
list_externals =
+
allow
list_externals =
allure
commands =
allure serve "allure-report"
allure
commands =
allure serve "allure-report"