From 33266fbb9053ef6707e784abe7639d3397d8aecb Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Fri, 26 May 2023 14:03:23 +0200 Subject: [PATCH] Fixes for ansible-lint in tox linter job This patch updated ansible-lint version on pre-commit configuration file and updates tox.ini to install ansible and collections needed for ansible-lint validation. Change-Id: Iacf544dfffa0e68c369e19c96cce67d04cc22c68 Related-Bug: #2019875 Signed-off-by: Bogdan Dobrelya --- .ansible-lint | 2 ++ .pre-commit-config.yaml | 2 +- tox.ini | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.ansible-lint b/.ansible-lint index 813f365..493aeb3 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,5 +1,7 @@ --- parseable: true +exclude_paths: + - roles/collect_logs/files/collect-container-logs.sh skip_list: # Add skips here only as last resort, like: - role-name diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4025a3b..d079f56 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: - flake8-black>=0.1.1 language_version: python3 - repo: https://github.com/ansible/ansible-lint.git - rev: v5.3.2 + rev: v6.16.0 hooks: - id: ansible-lint always_run: true diff --git a/tox.ini b/tox.ini index 190d186..1ceb69e 100644 --- a/tox.ini +++ b/tox.ini @@ -35,6 +35,10 @@ commands = bindep test [testenv:linters] basepython = python3 +deps = + pre-commit>=1.20.0 + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt setenv = ANSIBLE_LIBRARY=./library commands =