From 08f517e059027a1520bb2d1140abb3314153a377 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Mon, 19 Aug 2024 16:06:22 +0200
Subject: [PATCH] refctor: rework ci to ue ansible-lint and fix molecule

---
 .later.yml                                    | 15 --------------
 .woodpecker/docs.yaml                         | 10 +++++-----
 .woodpecker/lint.yaml                         |  6 +++---
 .woodpecker/test.yaml                         |  2 +-
 .yamllint                                     | 20 +++++++++++++++++++
 meta/main.yml                                 |  4 ----
 molecule/default/molecule.yml                 |  6 +++---
 molecule/requirements.yml => requirements.yml |  0
 tasks/instance.yml                            |  2 +-
 tasks/main.yml                                |  3 ++-
 10 files changed, 35 insertions(+), 33 deletions(-)
 delete mode 100644 .later.yml
 create mode 100644 .yamllint
 rename molecule/requirements.yml => requirements.yml (100%)

diff --git a/.later.yml b/.later.yml
deleted file mode 100644
index 2703cb9..0000000
--- a/.later.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-ansible:
-  custom_modules:
-    - iptables_raw
-    - openssl_pkcs12
-    - proxmox_kvm
-    - ucr
-    - corenetworks_dns
-    - corenetworks_token
-
-rules:
-  exclude_files:
-    - "LICENSE*"
-    - "**/*.md"
-    - "**/*.ini"
diff --git a/.woodpecker/docs.yaml b/.woodpecker/docs.yaml
index f053ca8..857444b 100644
--- a/.woodpecker/docs.yaml
+++ b/.woodpecker/docs.yaml
@@ -9,11 +9,11 @@ steps:
   - name: generate
     image: quay.io/thegeeklab/ansible-doctor
     environment:
-      ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/
-      ANSIBLE_DOCTOR_FORCE_OVERWRITE: "true"
-      ANSIBLE_DOCTOR_LOG_LEVEL: INFO
-      ANSIBLE_DOCTOR_ROLE_NAME: ${CI_REPO_NAME}
-      ANSIBLE_DOCTOR_TEMPLATE: readme
+      ANSIBLE_DOCTOR_EXCLUDE_FILES: "['molecule/']"
+      ANSIBLE_DOCTOR_RENDERER__FORCE_OVERWRITE: "true"
+      ANSIBLE_DOCTOR_LOGGING__LEVEL: info
+      ANSIBLE_DOCTOR_ROLE__NAME: ${CI_REPO_NAME}
+      ANSIBLE_DOCTOR_TEMPLATE__NAME: readme
 
   - name: format
     image: quay.io/thegeeklab/alpine-tools
diff --git a/.woodpecker/lint.yaml b/.woodpecker/lint.yaml
index 36b1ec8..c48a8e4 100644
--- a/.woodpecker/lint.yaml
+++ b/.woodpecker/lint.yaml
@@ -6,10 +6,10 @@ when:
       - ${CI_REPO_DEFAULT_BRANCH}
 
 steps:
-  - name: ansible-later
-    image: quay.io/thegeeklab/ansible-later:4
+  - name: ansible-lint
+    image: quay.io/thegeeklab/ansible-dev-tools:1
     commands:
-      - ansible-later
+      - ansible-lint
     environment:
       FORCE_COLOR: "1"
 
diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml
index 256ad91..661dc8b 100644
--- a/.woodpecker/test.yaml
+++ b/.woodpecker/test.yaml
@@ -7,7 +7,7 @@ when:
 
 variables:
   - &molecule_base
-    image: quay.io/thegeeklab/molecule:6
+    image: quay.io/thegeeklab/ansible-dev-tools:1
     group: molecule
     environment:
       PY_COLORS: "1"
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..df1d39e
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,20 @@
+---
+extends: default
+
+rules:
+  truthy:
+    allowed-values: ["True", "False"]
+  comments:
+    min-spaces-from-content: 1
+  comments-indentation: False
+  line-length: disable
+  braces:
+    min-spaces-inside: 0
+    max-spaces-inside: 1
+  brackets:
+    min-spaces-inside: 0
+    max-spaces-inside: 0
+  indentation: enable
+  octal-values:
+    forbid-implicit-octal: True
+    forbid-explicit-octal: True
diff --git a/meta/main.yml b/meta/main.yml
index 65ed1cc..9483d14 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -19,7 +19,3 @@ galaxy_info:
         - "9"
   galaxy_tags: []
 dependencies: []
-collections:
-  - xoxys.general
-  - community.general
-  - community.docker
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 6df22e3..7eaa7e5 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -4,11 +4,11 @@ driver:
 dependency:
   name: galaxy
   options:
-    role-file: molecule/requirements.yml
-    requirements-file: molecule/requirements.yml
+    role-file: requirements.yml
+    requirements-file: requirements.yml
 platforms:
   - name: "rocky9-woodpecker-agent"
-    server_type: "CX22"
+    server_type: "cx22"
     image: "rocky-9"
 provisioner:
   name: ansible
diff --git a/molecule/requirements.yml b/requirements.yml
similarity index 100%
rename from molecule/requirements.yml
rename to requirements.yml
diff --git a/tasks/instance.yml b/tasks/instance.yml
index 0fcca2e..2173517 100644
--- a/tasks/instance.yml
+++ b/tasks/instance.yml
@@ -5,7 +5,7 @@
     __woodpecker_agent_volumes: "{{ inst.volumes | default(woodpecker_agent_volumes) }}"
     __woodpecker_agent_cap_add: "{{ inst.cap_add | default(woodpecker_agent_cap_add) }}"
     __woodpecker_agent_cap_drop: "{{ inst.cap_drop | default(woodpecker_agent_cap_drop) }}"
-    __woodpecker_agent_env: "{{ inst.env | default (woodpecker_agent_env) }}"
+    __woodpecker_agent_env: "{{ inst.env | default(woodpecker_agent_env) }}"
     __woodpecker_agent_filter_labels: "{{ inst.filter_labels | default(woodpecker_agent_filter_labels) }}"
 
 - name: Create container volumes
diff --git a/tasks/main.yml b/tasks/main.yml
index ba6e598..7f23ab4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,6 @@
 ---
-- ansible.builtin.include_tasks:
+- name: Include instance '{{ inst.name }}'
+  ansible.builtin.include_tasks:
     file: instance.yml
   loop: "{{ woodpecker_agent_instances }}"
   loop_control: