Merge bashate/pep8 lint jobs in common job
Instead of launching two separate build jobs in our CI infrastructure, one for bashate and one for pep8, launch a single one. While the jobs are short, the setup of the images takes a long time, so this is friendlier to our CI infrastructure. Use the pep8 environment as common lint target and merge the bashate job into it. This patch also renamed dev-requirements to test-requirements to bring it into line with all other OpenStack projects. Change-Id: I588af7c8cf5e15364e5be86a41c1153ba3a5cbba
This commit is contained in:
parent
0cf98aeda8
commit
4707a998a1
25
tox.ini
25
tox.ini
|
@ -1,13 +1,13 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 1.6
|
minversion = 1.6
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
envlist = docs,pep8,bashate,ansible-syntax,ansible-lint
|
envlist = docs,pep8,ansible-syntax,ansible-lint,ansible-functional
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -U {opts} {packages}
|
install_command = pip install -U {opts} {packages}
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
deps = -r{toxinidir}/dev-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands =
|
commands =
|
||||||
/usr/bin/find . -type f -name "*.pyc" -delete
|
/usr/bin/find . -type f -name "*.pyc" -delete
|
||||||
ansible-galaxy install \
|
ansible-galaxy install \
|
||||||
|
@ -20,13 +20,14 @@ commands = python setup.py build_sphinx
|
||||||
|
|
||||||
# environment used by the -infra templated docs job
|
# environment used by the -infra templated docs job
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
deps = -r{toxinidir}/dev-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
# Run hacking/flake8 check for all python files
|
# Run various lint checks
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
deps = flake8
|
deps = flake8
|
||||||
whitelist_externals = bash
|
whitelist_externals = bash
|
||||||
|
# Run hacking/flake8 check for all python files
|
||||||
commands =
|
commands =
|
||||||
bash -c "grep -Irl \
|
bash -c "grep -Irl \
|
||||||
-e '!/usr/bin/env python' \
|
-e '!/usr/bin/env python' \
|
||||||
|
@ -40,19 +41,9 @@ commands =
|
||||||
--exclude '*.sh' \
|
--exclude '*.sh' \
|
||||||
{toxinidir} | xargs flake8 --verbose"
|
{toxinidir} | xargs flake8 --verbose"
|
||||||
|
|
||||||
[flake8]
|
|
||||||
# Ignores the following rules due to how ansible modules work in general
|
|
||||||
# F403 'from ansible.module_utils.basic import *' used; unable to detect undefined names
|
|
||||||
# H303 No wildcard (*) import.
|
|
||||||
ignore=F403,H303
|
|
||||||
|
|
||||||
# Run bashate check for all bash scripts
|
# Run bashate check for all bash scripts
|
||||||
# Ignores the following rules:
|
# Ignores the following rules:
|
||||||
# E003: Indent not multiple of 4 (we prefer to use multiples of 2)
|
# E003: Indent not multiple of 4 (we prefer to use multiples of 2)
|
||||||
[testenv:bashate]
|
|
||||||
deps = bashate
|
|
||||||
whitelist_externals = bash
|
|
||||||
commands =
|
|
||||||
bash -c "grep -Irl \
|
bash -c "grep -Irl \
|
||||||
-e '!/usr/bin/env bash' \
|
-e '!/usr/bin/env bash' \
|
||||||
-e '!/bin/bash' \
|
-e '!/bin/bash' \
|
||||||
|
@ -63,6 +54,12 @@ commands =
|
||||||
--exclude 'tox.ini' \
|
--exclude 'tox.ini' \
|
||||||
{toxinidir} | xargs bashate --verbose --ignore=E003"
|
{toxinidir} | xargs bashate --verbose --ignore=E003"
|
||||||
|
|
||||||
|
[flake8]
|
||||||
|
# Ignores the following rules due to how ansible modules work in general
|
||||||
|
# F403 'from ansible.module_utils.basic import *' used; unable to detect undefined names
|
||||||
|
# H303 No wildcard (*) import.
|
||||||
|
ignore=F403,H303
|
||||||
|
|
||||||
[testenv:ansible-syntax]
|
[testenv:ansible-syntax]
|
||||||
changedir = tests
|
changedir = tests
|
||||||
commands =
|
commands =
|
||||||
|
|
Loading…
Reference in New Issue