Merge "Run all linters via pre-commit"
This commit is contained in:
commit
4be3d7012e
@ -1,5 +1,11 @@
|
|||||||
|
---
|
||||||
parseable: true
|
parseable: true
|
||||||
skip_list:
|
skip_list:
|
||||||
- ANSIBLE0006
|
- ANSIBLE0006
|
||||||
- ANSIBLE0012
|
- ANSIBLE0012
|
||||||
- ANSIBLE0016
|
- ANSIBLE0016
|
||||||
|
- '204' # [E204] Lines should be no longer than 120 chars
|
||||||
|
# E602 https://github.com/ansible/ansible-lint/issues/450
|
||||||
|
- '602' # [E602] Don't compare to empty string
|
||||||
|
# E405 is too new and we need to enable it in a separate change
|
||||||
|
- '405' # [E405] Remote package tasks should have a retry
|
||||||
|
@ -1,7 +1,42 @@
|
|||||||
|
---
|
||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/willthames/ansible-lint.git
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
rev: v3.5.1
|
rev: v2.1.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: ansible-lint
|
- id: end-of-file-fixer
|
||||||
entry: env ANSIBLE_LIBRARY=./library ansible-lint
|
- id: trailing-whitespace
|
||||||
files: \.(yaml|yml)$
|
- id: mixed-line-ending
|
||||||
|
- id: check-byte-order-marker
|
||||||
|
- id: check-executables-have-shebangs
|
||||||
|
- id: check-merge-conflict
|
||||||
|
- id: debug-statements
|
||||||
|
- id: flake8
|
||||||
|
additional_dependencies:
|
||||||
|
- hacking<1.2.0,>=1.1.0
|
||||||
|
- id: check-yaml
|
||||||
|
files: .*\.(yaml|yml)$
|
||||||
|
- repo: https://github.com/adrienverge/yamllint.git
|
||||||
|
rev: v1.14.0
|
||||||
|
hooks:
|
||||||
|
- id: yamllint
|
||||||
|
files: \.(yaml|yml)$
|
||||||
|
types: [file, yaml]
|
||||||
|
entry: yamllint --strict -f parsable
|
||||||
|
- repo: https://github.com/ansible/ansible-lint
|
||||||
|
rev: v4.0.1
|
||||||
|
hooks:
|
||||||
|
- id: ansible-lint
|
||||||
|
files: \.(yaml|yml)$
|
||||||
|
entry: env ANSIBLE_LIBRARY=./library ansible-lint --force-color -v
|
||||||
|
- repo: https://github.com/openstack-dev/bashate.git
|
||||||
|
rev: 0.6.0
|
||||||
|
hooks:
|
||||||
|
- id: bashate
|
||||||
|
entry: bashate --error . --verbose --ignore=E006,E040
|
||||||
|
# Run bashate check for all bash scripts
|
||||||
|
# Ignores the following rules:
|
||||||
|
# E006: Line longer than 79 columns (as many scripts use jinja
|
||||||
|
# templating, this is very difficult)
|
||||||
|
# E040: Syntax error determined using `bash -n` (as many scripts
|
||||||
|
# use jinja templating, this will often fail and the syntax
|
||||||
|
# error will be discovered in execution anyway)
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
---
|
---
|
||||||
|
extends: default
|
||||||
|
|
||||||
rules:
|
rules:
|
||||||
|
document-start: disable
|
||||||
line-length:
|
line-length:
|
||||||
max: 999
|
max: 999
|
||||||
allow-non-breakable-words: true
|
allow-non-breakable-words: true
|
||||||
|
1
LICENSE
1
LICENSE
@ -199,4 +199,3 @@
|
|||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
---
|
||||||
- name: image-build
|
- name: image-build
|
||||||
src: https://github.com/redhat-openstack/ansible-role-tripleo-image-build
|
src: https://github.com/redhat-openstack/ansible-role-tripleo-image-build
|
||||||
scm: git
|
scm: git
|
||||||
version: master
|
version: master
|
||||||
|
|
||||||
|
@ -20,4 +20,3 @@ pipelining = True
|
|||||||
control_path = %(directory)s/%%h-%%r
|
control_path = %(directory)s/%%h-%%r
|
||||||
ssh_args = -o ControlMaster=auto -o ControlPersist=270s -o ServerAliveInterval=30 -o GSSAPIAuthentication=no
|
ssh_args = -o ControlMaster=auto -o ControlPersist=270s -o ServerAliveInterval=30 -o GSSAPIAuthentication=no
|
||||||
retries = 3
|
retries = 3
|
||||||
|
|
||||||
|
@ -204,4 +204,3 @@ bash $BASE_QUICKSTART_DIR/ci-scripts/full-deploy.sh $RELEASE $BUILD_SYS $CONFIG
|
|||||||
|
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
@ -125,5 +125,3 @@ The full documentation is in the ``doc/source`` directory, it can be built
|
|||||||
using::
|
using::
|
||||||
|
|
||||||
tox -e docs
|
tox -e docs
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
|
@ -15,6 +15,9 @@
|
|||||||
# generate_baremetal_macs method ripped from
|
# generate_baremetal_macs method ripped from
|
||||||
# openstack/tripleo-incubator/scripts/configure-vm
|
# openstack/tripleo-incubator/scripts/configure-vm
|
||||||
|
|
||||||
|
import math
|
||||||
|
import random
|
||||||
|
|
||||||
DOCUMENTATION = '''
|
DOCUMENTATION = '''
|
||||||
---
|
---
|
||||||
module: generate_macs
|
module: generate_macs
|
||||||
@ -24,9 +27,6 @@ description:
|
|||||||
- Generate a list of Ethernet MAC addresses suitable for baremetal testing.
|
- Generate a list of Ethernet MAC addresses suitable for baremetal testing.
|
||||||
'''
|
'''
|
||||||
|
|
||||||
import math
|
|
||||||
import random
|
|
||||||
|
|
||||||
MAX_NUM_MACS = math.trunc(0xff / 2)
|
MAX_NUM_MACS = math.trunc(0xff / 2)
|
||||||
|
|
||||||
|
|
||||||
@ -86,6 +86,8 @@ def main():
|
|||||||
module.exit_json(**result)
|
module.exit_json(**result)
|
||||||
|
|
||||||
# see http://docs.ansible.com/developing_modules.html#common-module-boilerplate
|
# see http://docs.ansible.com/developing_modules.html#common-module-boilerplate
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule # noqa
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
@ -39,4 +39,3 @@ other:
|
|||||||
- Undercloud deploy role moved to tripleo-quickstart-extras
|
- Undercloud deploy role moved to tripleo-quickstart-extras
|
||||||
- Added repo configuration to the release configs for usage by the repo-setup
|
- Added repo configuration to the release configs for usage by the repo-setup
|
||||||
role in tripleo-quickstart-extras
|
role in tripleo-quickstart-extras
|
||||||
|
|
||||||
|
@ -23,4 +23,3 @@ deprecations:
|
|||||||
tested into featureset files. For example, the old
|
tested into featureset files. For example, the old
|
||||||
minimal.yml file was split into no_netiso.yml and
|
minimal.yml file was split into no_netiso.yml and
|
||||||
1ctlr_1comp.yml
|
1ctlr_1comp.yml
|
||||||
|
|
||||||
|
@ -37,3 +37,9 @@ universal = 1
|
|||||||
[pbr]
|
[pbr]
|
||||||
skip_authors = True
|
skip_authors = True
|
||||||
skip_changelog = True
|
skip_changelog = True
|
||||||
|
|
||||||
|
[flake8]
|
||||||
|
# E123, E125 skipped as they are invalid PEP-8.
|
||||||
|
show-source = True
|
||||||
|
ignore = E123,E125
|
||||||
|
builtins = _
|
||||||
|
@ -1,9 +1,6 @@
|
|||||||
openstackdocstheme>=1.11.0 # Apache-2.0
|
openstackdocstheme>=1.11.0 # Apache-2.0
|
||||||
hacking<0.11,>=0.10
|
|
||||||
|
|
||||||
bashate>=0.2 # Apache-2.0
|
|
||||||
docutils>=0.11
|
docutils>=0.11
|
||||||
sphinx>=1.6.2 # BSD
|
sphinx>=1.6.2 # BSD
|
||||||
reno>=1.8.0 # Apache-2.0
|
reno>=1.8.0 # Apache-2.0
|
||||||
yamllint # GPLv3
|
|
||||||
pre-commit # MIT
|
pre-commit # MIT
|
44
tox.ini
44
tox.ini
@ -26,49 +26,27 @@ basepython = python3
|
|||||||
commands = python setup.py build_sphinx
|
commands = python setup.py build_sphinx
|
||||||
|
|
||||||
[testenv:bashate]
|
[testenv:bashate]
|
||||||
|
envdir = {toxworkdir}/linters
|
||||||
commands =
|
commands =
|
||||||
# Run bashate check for all bash scripts
|
python -m pre_commit run bashate -a
|
||||||
# Ignores the following rules:
|
|
||||||
# E006: Line longer than 79 columns (as many scripts use jinja
|
|
||||||
# templating, this is very difficult)
|
|
||||||
# E040: Syntax error determined using `bash -n` (as many scripts
|
|
||||||
# use jinja templating, this will often fail and the syntax
|
|
||||||
# error will be discovered in execution anyway)
|
|
||||||
bash -c "git ls-files | xargs grep --binary-files=without-match \
|
|
||||||
--files-with-match '^.!.*\(ba\)\?sh$' \
|
|
||||||
--exclude-dir .tox \
|
|
||||||
--exclude-dir .git \
|
|
||||||
| xargs bashate --error . --verbose --ignore=E006,E040"
|
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
envdir = {toxworkdir}/linters
|
||||||
commands =
|
commands =
|
||||||
# Run hacking/flake8 check for all python files
|
python -m pre_commit run flake8 -a
|
||||||
bash -c "git ls-files | xargs grep --binary-files=without-match \
|
|
||||||
--files-with-match '^.!.*python$' \
|
|
||||||
--exclude-dir .tox \
|
|
||||||
--exclude-dir .git \
|
|
||||||
--exclude-dir .eggs \
|
|
||||||
--exclude-dir *.egg-info \
|
|
||||||
--exclude-dir dist \
|
|
||||||
--exclude-dir *lib/python* \
|
|
||||||
--exclude-dir doc \
|
|
||||||
| xargs flake8 --verbose"
|
|
||||||
|
|
||||||
[testenv:ansible-lint]
|
[testenv:ansible-lint]
|
||||||
basepython=python2
|
|
||||||
setenv =
|
setenv =
|
||||||
ANSIBLE_LIBRARY=./library
|
ANSIBLE_LIBRARY=./library
|
||||||
|
envdir = {toxworkdir}/linters
|
||||||
commands =
|
commands =
|
||||||
python -m pre_commit run --all-files
|
python -m pre_commit run ansible-lint -a
|
||||||
|
|
||||||
[testenv:linters]
|
[testenv:linters]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
commands =
|
commands =
|
||||||
python -m yamllint .
|
# check only modified files:
|
||||||
{[testenv:bashate]commands}
|
python -m pre_commit run -a
|
||||||
{[testenv:pep8]commands}
|
|
||||||
{[testenv:ansible-lint]commands}
|
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
@ -79,9 +57,3 @@ commands = bash -c ci-scripts/releasenotes_tox.sh
|
|||||||
changedir = {toxinidir}
|
changedir = {toxinidir}
|
||||||
commands =
|
commands =
|
||||||
{posargs:echo done}
|
{posargs:echo done}
|
||||||
|
|
||||||
[flake8]
|
|
||||||
# E123, E125 skipped as they are invalid PEP-8.
|
|
||||||
show-source = True
|
|
||||||
ignore = E123,E125
|
|
||||||
builtins = _
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
---
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- tripleo-undercloud-jobs
|
- tripleo-undercloud-jobs
|
||||||
|
Loading…
Reference in New Issue
Block a user