From 6ced4627bd57a8bb2a73a08633c032275d55b864 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 7 Sep 2022 19:19:38 +0000 Subject: [PATCH] Address breakage due to ansible-lint 6.5 Pin ansible-lint<6.5 for now due to the https://github.com/ansible/ansible-lint/issues/2320 regression which ignores our skip tags. Also add the zuul.d directory to the list of directories to avoid linting, since those YAML files aren't Ansible files and it doesn't seem to know not to try parsing them anyway. While we're here, "fix" a task name not starting with an upper-case letter, which for some reason ansible-lint now seems to think is important. If we decide to continue using ansible-lint, it's probably going to persist in complaining about that. Change-Id: I46826210dfa4442af5c36d1439d1a1047ca0ba90 --- .ansible-lint | 1 + roles/prepare-zanata-client/tasks/main.yaml | 2 +- test-requirements.txt | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index b8c91228..fcf67be5 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,5 +1,6 @@ exclude_paths: - playbooks/legacy + - zuul.d parseable: true # [204] Lines < 160 # [301] Commands should not change things if nothing needs doing diff --git a/roles/prepare-zanata-client/tasks/main.yaml b/roles/prepare-zanata-client/tasks/main.yaml index bce24245..c1d06b7c 100644 --- a/roles/prepare-zanata-client/tasks/main.yaml +++ b/roles/prepare-zanata-client/tasks/main.yaml @@ -73,7 +73,7 @@ become: true # This is a preview module in Ansible 2.3. It may not work. -- name: import cert to java keystore +- name: Import cert to java keystore java_cert: cert_url: "{{ zanata_api_credentials.fqdn }}" keystore_path: /etc/ssl/certs/java/cacerts diff --git a/test-requirements.txt b/test-requirements.txt index 008d9b3c..a6a98fdd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,5 +6,6 @@ hacking>=4.0.0,<5.0.0 # Apache-2.0 # ansible-lint requires ansible>=2.9 ansible>=5,<6 -ansible-lint>=6,<7 +# pin until https://github.com/ansible/ansible-lint/issues/2320 is fixed +ansible-lint>=6,<6.5 bashate>=0.2