From ae57bd1db6d92952ecc0307bda78f1583b1f38ba Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Mon, 19 Aug 2024 10:08:20 +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                 |  3 ---
 molecule/default/molecule.yml |  2 +-
 7 files changed, 30 insertions(+), 28 deletions(-)
 delete mode 100644 .later.yml
 create mode 100644 .yamllint

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 f801968..c66c1ce 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -21,6 +21,3 @@ galaxy_info:
     - ntp
     - chrony
 dependencies: []
-collections:
-  - xoxys.general
-  - community.general
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 5880678..b4a2491 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -8,7 +8,7 @@ dependency:
     requirements-file: molecule/requirements.yml
 platforms:
   - name: "rocky9-chrony"
-    server_type: "CX22"
+    server_type: "cx22"
     image: "rocky-9"
 provisioner:
   name: ansible