Fix: Update shellcheck ansible role

Update molecule test formats and update the role to build with latest version of ansible. Fix ansible lint errors and warnings. Update tox and pre-commit dependencies to build with latest versions of ansible and molecule. Signed-off-by: Anil Belur <[email protected]> Change-Id: I5951bf442e54726845f1b886b27f656c97b9948d
lfit · Feb 11, 2024 · c16de7c · c16de7c
1 parent ed2fb0e
commit c16de7c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/.yamllint b/.yamllint
@@ -9,9 +9,7 @@ rules:
     max-spaces-inside: 1
     level: error
   line-length: disable
-  # NOTE(retr0h): Templates no longer fail this lint rule.
-  #               Uncomment if running old Molecule templates.
-  # truthy: disable
+  truthy: disable
 
 ignore: |
   .tox/
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint tasks/*.yml
 platforms:
   - name: centos7
     image: centos:7
@@ -16,6 +12,8 @@ platforms:
     image: ubuntu:18.04
   - name: ubuntu2004
     image: ubuntu:20.04
+  - name: ubuntu2204
+    image: ubuntu:22.04
 provisioner:
   name: ansible
 scenario:

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,21 +1,22 @@
 ---
 - name: Fetch ShellCheck
-  get_url:
+  ansible.builtin.get_url:
     url: 'https://github.com/koalaman/shellcheck/releases/download/{{ shellcheck_version }}/shellcheck-{{ shellcheck_version }}.linux.x86_64.tar.xz'
     dest: /tmp/shellcheck.tar.xz
     checksum: '{{ shellcheck_checksum }}'
+    mode: 0644
   become: true
 
 - name: Unpack ShellCheck
-  unarchive:
+  ansible.builtin.unarchive:
     src: /tmp/shellcheck.tar.xz
     dest: /tmp
     list_files: true
     remote_src: true
   become: true
 
 - name: Install ShellCheck to /usr/local/bin/shellcheck
-  copy:
+  ansible.builtin.copy:
     src: '/tmp/shellcheck-{{ shellcheck_version }}/shellcheck'
     dest: /usr/local/bin/shellcheck
     mode: 0755

diff --git a/tox.ini b/tox.ini
@@ -2,30 +2,28 @@
 minversion = 1.6
 envlist =
     molecule,
-    pre-commit
+    pre-commit,
+    lint
 skipsdist=true
 
 [testenv:molecule]
 basepython = python3
 deps =
-    ansible~=2.9.6
-    ansible-lint~=4.2.0
+    ansible
     docker
     molecule
-    yamllint
-    molecule~=3.0.8
-    molecule[docker]
-    pytest~=5.4.0
+    molecule-docker
 passenv = *
 commands =
     ./molecule.sh
 allowlist_externals =
     ./molecule.sh
 
 [testenv:pre-commit]
-basepython = python3
+allowlist_externals =
+    /bin/sh
 deps = pre-commit
-allowlist_externals = /bin/sh
+passenv = HOME
 commands =
     pre-commit run --all-files --show-diff-on-failure
     /bin/sh -c 'if ! git config --get user.name > /dev/null; then \
@@ -45,3 +43,15 @@ commands =
     /bin/sh -c "if [ -f .git/REMOVE_USEREMAIL ]; then \
         git config --global --unset user.email; \
         rm -f .git/REMOVE_USEREMAIL; fi"
+
+[testenv:lint]
+basepython = python310
+deps =
+    ansible-lint
+    yamllint
+commands =
+    /bin/bash -c "ansible-lint tasks/*.yml"
+    yamllint .
+allowlist_externals =
+    /bin/bash
+    yamllint