Merge pull request #272 from richm/ansible-lint-test-2.16

ci: Use supported ansible-lint action; run ansible-lint against the collection

.ansible-lint

@@ -1,6 +1,11 @@
+---
 exclude_paths:
   - tests/roles/
   - .tox/
   - .markdownlint.yaml
 skip_list:
   - var-naming[no-role-prefix]
+mock_roles:
+  - willshersystems.sshd.ansible-sshd
+mock_modules:
+  - ansible.posix.mount

.github/workflows/ansible-lint.yml

@@ -1,12 +1,38 @@
 name: Ansible Lint  # feel free to pick your own name
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
+
+env:
+  LSR_ROLE2COLL_NAMESPACE: willshersystems
+  LSR_ROLE2COLL_NAME: sshd
+
+permissions:
+  contents: read
 
 jobs:
   ansible-lint:
     runs-on: ubuntu-latest
     steps:
+      - name: Update pip, git
+        run: |
+          set -euxo pipefail
+          sudo apt update
+          sudo apt install -y git
       - name: checkout PR
         uses: actions/checkout@v4
-      - name: Lint Ansible playbook
+      - name: Install tox, tox-lsr
-        uses: ansible/ansible-lint-action@main
+        run: |
+          set -euxo pipefail
+          pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.2.1"
+      - name: Convert role to collection format
+        run: |
+          set -euxo pipefail
+          TOXENV=collection lsr_ci_runtox
+          coll_dir=".tox/ansible_collections/$LSR_ROLE2COLL_NAMESPACE/$LSR_ROLE2COLL_NAME"
+          # ansible-lint action requires a .git directory???
+          # https://github.com/ansible/ansible-lint/blob/main/action.yml#L45
+          mkdir -p "$coll_dir/.git"
+      - name: Run ansible-lint
+        uses: ansible/ansible-lint@v6
+        with:
+          working_directory: .tox/ansible_collections/${{ env.LSR_ROLE2COLL_NAMESPACE }}/${{ env.LSR_ROLE2COLL_NAME }}

.gitignore

@@ -1,2 +1,3 @@
 .vagrant
 tests/test.retry
+.tox

.markdownlint.yaml

@@ -1,3 +1,4 @@
+---
 # Default state for all rules
 default: true
 

.ostree/get_ostree_data.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 

meta/make_ostree_packages_files

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 

tests/tests_all_options.yml

@@ -132,10 +132,8 @@
 
     - name: Verify the options are in the file
       ansible.builtin.assert:
-        that:
+        that: item ~ " yes" in config.content | b64decode
-          - "'{{ item }} yes' in config.content | b64decode "
+      loop: "{{ sshd_options.stdout_lines }}"
-      loop:
-        "{{ sshd_options.stdout_lines }}"
       when: not sshd_skip_test
 
     - name: Check generated files for ansible_managed, fingerprint

tox.ini

@@ -0,0 +1,7 @@
+[lsr_config]
+lsr_enable = true
+
+[testenv]
+setenv =
+    LSR_ROLE2COLL_NAMESPACE = willshersystems
+    LSR_ROLE2COLL_NAME = sshd

vars/main.yml

@@ -1,3 +1,4 @@
+---
 __sshd_config_file: "/etc/ssh/sshd_config"
 __sshd_config_owner: "root"
 __sshd_config_group: "root"