X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=tox.ini;h=91332c12cbe1d4e0fd04de2402413a21dd22a2a4;hb=6af1c0c3eda77ae8113ba6760ad5a86313f43da8;hp=f008b2984af7d3468ec73706ab1e0d66bad0a30f;hpb=f36230fbedf0cc4f12ffa307474a72a040917b63;p=releng%2Fglobal-jjb.git diff --git a/tox.ini b/tox.ini index f008b298..91332c12 100644 --- a/tox.ini +++ b/tox.ini @@ -7,6 +7,7 @@ envlist = jjb-latest, jjb-version, license, + bashate, pre-commit skipsdist = True @@ -17,13 +18,15 @@ commands = sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html [testenv:ensure-documented] +allowlist_externals = + ./ensure-documented.sh commands = ./ensure-documented.sh [testenv:jjb] basepython = python3 deps = - jenkins-job-builder==2.8.0 + jenkins-job-builder==6.0.0 commands = jenkins-jobs -l DEBUG test --recursive -o {toxinidir}/archives/job-configs {toxinidir}/jjb:{toxinidir}/.jjb-test @@ -31,6 +34,8 @@ commands = basepython = python3 deps = jenkins-job-builder +allowlist_externals = + ./jjb-compare-xml.sh commands = ./jjb-compare-xml.sh @@ -76,13 +81,29 @@ commands = git config --global --unset user.email; \ rm -f .git/REMOVE_USEREMAIL; fi" +[testenv:bashate] +basepython = python3 +deps = + bashate +allowlist_externals = find + sh +setenv = + RULES_IGNORED = E001,E002,E003,E004,E005,E007,E008,E009,E010,E011,E012,E013,E014,E015,E016,E017,E018,E019,E020,E021,E022,E023,E024,E025,E026,E027,E028,E029,E030,E031,E032,E033,E034,E035,E036,E037,E038,E039,E040,E041,E042,E043,E044 +#RULES_IGNORED = `seq -s',E' -w 0 100| cut -d, -f2-6,8-45)` +commands = + # forbid lines > 120 char + sh -c "find . -not -path '*/\.*' -name '*.sh' -exec bashate -e E006 -i $RULES_IGNORED --max-line-length 120 \{\} +" + # perform bashate and warn lines > 80 char + #find . -not -path '*/\.*' -name *.sh -exec bashate \{\} + + #The option --max-line-length 80 is used by default. + ######### # Tools # ######### [testenv:jenkins-jobs] deps = - jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:2.8.0} + jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:6.0.0} commands = jenkins-jobs {posargs:--help}