Merge "Use ansible 6.x"

This commit is contained in:
Zuul 2023-01-18 15:06:36 +00:00 committed by Gerrit Code Review
commit e83e4d8631
3 changed files with 24 additions and 11 deletions

View File

@ -1,11 +1,24 @@
skip_list: skip_list:
# FIXME: gradually fix and remove these exclusions: # FIXME: gradually fix and remove these exclusions:
- '208' # File permissions not mentioned - deprecated-module # Deprecated module
- '301' # Commands should not change things if nothing needs doing - fqcn[action-core] # Use FQCN for builtin actions
- '502' # All tasks should be named - jinja[spacing] # Jinja2 spacing could be improved
- '701' # meta/main.yml should contain relevant info - meta-no-info # meta/main.yml should contain relevant info
- '702' # Tags must contain lowercase letters and digits only - meta-no-tags # Tags must contain lowercase letters and digits only
- name[casing] #All names should start with an uppercase letter
- name[missing] # All tasks should be named
- name[play] # All plays should be named
- name[template] # Jinja templates should only be at the end of 'name'
- no-changed-when # Commands should not change things if nothing needs doing
- yaml[colons] # Too many spaces after colon
- yaml[comments] # Missing starting space in comment
- yaml[empty-lines] # Too many blank lines
- yaml[indentation] # Wrong indentation
- yaml[line-length] # Line too long
- yaml[truthy] # Truthy value should be one of [false, true]
# NOTE(dtantsur): the following rules should likely stay excluded: # NOTE(dtantsur): the following rules should likely stay excluded:
- '106' # Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern' - experimental
- '403' # Package installs should not use latest - role-name # Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern'
- '503' # Tasks that run when changed should likely be handlers - package-latest # Package installs should not use latest
- no-handler # Tasks that run when changed should likely be handlers

View File

@ -6,7 +6,7 @@ set -euo pipefail
# NOTE(pas-ha) the above exports some useful variables like # NOTE(pas-ha) the above exports some useful variables like
# $PYTHON , $PIP and $VENV depending on venv install or not # $PYTHON , $PIP and $VENV depending on venv install or not
DEFAULT_PIP_ANSIBLE='>=5,<6' DEFAULT_PIP_ANSIBLE='>=6,<7'
ANSIBLE_COLLECTIONS_REQ=${ANSIBLE_COLLECTIONS_REQ:-$(dirname $0)/../ansible-collections-requirements.yml} ANSIBLE_COLLECTIONS_REQ=${ANSIBLE_COLLECTIONS_REQ:-$(dirname $0)/../ansible-collections-requirements.yml}
ANSIBLE_COLLECTION_SOURCE_PATH= ANSIBLE_COLLECTION_SOURCE_PATH=

View File

@ -79,7 +79,7 @@ filename = *.py
[testenv:linters] [testenv:linters]
allowlist_externals = bash allowlist_externals = bash
deps = deps =
ansible>=5,<6 ansible>=6,<7
ansible-lint>=5,<6 ansible-lint>=6,<7
commands = commands =
bash tools/ansible-lint.sh bash tools/ansible-lint.sh