Merge "Update to ansible-lint 6.8.2"

This commit is contained in:
Zuul 2022-11-09 01:10:05 +00:00 committed by Gerrit Code Review
commit 9dd3830a35
3 changed files with 21 additions and 3 deletions

View File

@ -6,8 +6,28 @@ skip_list:
- no-tabs # Most files should not contain tabs
- role-name # Role name does not match ``^[a-z][a-z0-9_]+$`` pattern
- fqcn-builtins # It would probably be good to enforce this, but it's a lot
- fqcn # similar to above
- risky-file-permissions # It would probably also good to enforce this if someone wants to look at them
- schema # This is a stricter form of schema per https://github.com/ansible/schemas. might also be good if someone has motivation?
# NOTE(ianw) After following the jinja formatting extensions in
# ansible-lint for a few releases, this does not seem to be
# appropriate for us. It has broken in a couple of releases [1,2]
# -- but more importantly as discussed in [1] this is a bit
# opinonated in ways we may not like; for example
# varibale|int > 123
# I would argue is clearer than
# variable | int > 123
# which it tries to enforce. This is a bit unfortunate because it
# does pick up some other things were people have clearly forgotten
# spaces around variables, etc. Let's leave it up to humans to
# decide on good jinja here.
# [1] https://github.com/ansible/ansible-lint/issues/2330
# [2] https://github.com/ansible/ansible-lint/issues/2461
# [3] https://github.com/ansible/ansible-lint/issues/2605
- jinja[spacing]
- jinja[invalid]
use_default_rules: true
verbosity: 1
mock_modules:

View File

@ -5,4 +5,4 @@ flake8
yamllint>=1.23.0
# 6.5.0 : https://github.com/ansible/ansible-lint/issues/2330
# 6.5.1 : https://github.com/ansible/ansible-lint/issues/2320
ansible-lint>6.0.0,<6.5.0
ansible-lint>6.8.0

View File

@ -96,8 +96,6 @@
# gzip will however return 1 if any compressed file is encountered, so we
# must ignore that (there's no specific error code).
- name: Archive everything from logs
# https://github.com/ansible/ansible-lint/issues/2241
# noqa var-spacing
shell: gzip --recursive --best {{ zj_log_file.path }} || true
args:
chdir: "{{ stage_dir }}/logs"