Merge "Fix linters error and enable linters zuul gate"

This commit is contained in:
Zuul 2018-08-31 20:43:11 +00:00 committed by Gerrit Code Review
commit cd467e2ebd
4 changed files with 96 additions and 97 deletions

View File

@ -3,8 +3,8 @@
check: check:
jobs: jobs:
- openstack-tox-pep8 - openstack-tox-pep8
- openstack-tox-linters
gate: gate:
jobs: jobs:
- openstack-tox-pep8 - openstack-tox-pep8
- openstack-tox-linters

View File

@ -4,7 +4,6 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
backup_dir="/opt/backups" backup_dir="/opt/backups"
tmp_dir="${backup_dir}/image_temp" tmp_dir="${backup_dir}/image_temp"
@ -133,8 +132,7 @@ if [ $EUID -ne 0 ]; then
exit 1 exit 1
fi fi
if [ $# -ne 2 ] ; if [ $# -ne 2 ]; then
then
usage usage
exit 0 exit 0
fi fi
@ -209,4 +207,3 @@ elif [ "$1" = "import" ]; then
else else
usage usage
fi fi

10
tox.ini
View File

@ -14,6 +14,8 @@ deps = -r{toxinidir}/test-requirements.txt
[testenv:linters] [testenv:linters]
whitelist_externals = bash whitelist_externals = bash
#bashate ignore
#E006 Line too long
commands = commands =
bash -c "find {toxinidir} \ bash -c "find {toxinidir} \
-not \( -type d -name .?\* -prune \) \ -not \( -type d -name .?\* -prune \) \
@ -21,11 +23,11 @@ commands =
-not -name \*~ \ -not -name \*~ \
-not -name \*.md \ -not -name \*.md \
-name \*.sh \ -name \*.sh \
-print0 | xargs -0 bashate -v" -print0 | xargs -0 bashate -v -i E006"
bash -c "find {toxinidir} \ bash -c "find {toxinidir} \
\( -name middleware/io-monitor/recipes-common/io-monitor/io-monitor/io_monitor/test-tools/yaml/* -prune \) \ \( -path '{toxinidir}/openstack/python-heat/python-heat/templates*' \
-o \( -name .tox -prune \) \ -o -path '{toxinidir}/.tox' \) -a -prune \
-o -type f -name '*.yaml' \ -o -name '*.yaml' \
-print0 | xargs -0 yamllint" -print0 | xargs -0 yamllint"
[testenv:pep8] [testenv:pep8]