From f2c009b42d8cb9a3f74006453ed781e631dde218 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 19 Aug 2024 16:06:16 +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 ++++++++++++++ molecule/default/molecule.yml | 6 ++-- molecule/requirements.yml | 4 --- requirements.yml | 6 ++++ tasks/create.yml | 28 +++++++++++++++++++ tasks/delete.yml | 16 +++++++++++ tasks/main.yml | 52 ++++------------------------------- 11 files changed, 88 insertions(+), 77 deletions(-) delete mode 100644 .later.yml create mode 100644 .yamllint delete mode 100644 molecule/requirements.yml create mode 100644 requirements.yml create mode 100644 tasks/create.yml create mode 100644 tasks/delete.yml 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/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/molecule/requirements.yml deleted file mode 100644 index 5b676bf..0000000 --- a/molecule/requirements.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -collections: [] - -roles: [] diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 0000000..6731828 --- /dev/null +++ b/requirements.yml @@ -0,0 +1,6 @@ +--- +collections: + - name: community.general + - name: ansible.posix + +roles: [] diff --git a/tasks/create.yml b/tasks/create.yml new file mode 100644 index 0000000..cde57d9 --- /dev/null +++ b/tasks/create.yml @@ -0,0 +1,28 @@ +--- +- name: Create swap file + ansible.builtin.command: "fallocate -l {{ swap_size }}M {{ swap_path }}" + changed_when: False + when: swap_size | int > (ansible_swaptotal_mb | int) + 1 + +- name: Format swap file + ansible.builtin.command: "mkswap {{ swap_path }}" + changed_when: False + when: swap_size | int > (ansible_swaptotal_mb | int) + 1 + +- name: Fix file permissions + ansible.builtin.file: + path: "{{ swap_path }}" + owner: root + group: root + mode: "0600" + +- name: Mount swap file + ansible.posix.mount: + src: "{{ swap_path }}" + path: none + fstype: swap + state: present + +- name: Enable swap + ansible.builtin.command: "swapon -a" + changed_when: False diff --git a/tasks/delete.yml b/tasks/delete.yml new file mode 100644 index 0000000..947bd11 --- /dev/null +++ b/tasks/delete.yml @@ -0,0 +1,16 @@ +--- +- name: Disable swap + ansible.builtin.shell: "test -f {{ swap_path }} && swapoff {{ swap_path }} || true" + changed_when: False + +- name: Unmount swap file + ansible.posix.mount: + src: "{{ swap_path }}" + path: none + fstype: swap + state: absent + +- name: Remove swap file + ansible.builtin.file: + path: "{{ swap_path }}" + state: absent diff --git a/tasks/main.yml b/tasks/main.yml index ee56080..be62c57 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,48 +1,8 @@ --- -- when: not (swap_enabled | bool) or swap_size | int > (ansible_swaptotal_mb | int) + 1 - block: - - name: Disable swap - ansible.builtin.shell: "test -f {{ swap_path }} && swapoff {{ swap_path }} || true" - changed_when: False +- name: Delete swap file + ansible.builtin.include_tasks: delete.yml + when: not (swap_enabled | bool) or (swap_size | int > (ansible_swaptotal_mb | int) + 1) - - name: Unmount swap file - ansible.posix.mount: - src: "{{ swap_path }}" - path: none - fstype: swap - state: absent - - - name: Remove swap file - ansible.builtin.file: - path: "{{ swap_path }}" - state: absent - -- when: - - swap_enabled | bool - - swap_size | int > (ansible_swaptotal_mb | int) + 1 - block: - - name: Create swap file - ansible.builtin.command: "fallocate -l {{ swap_size }}M {{ swap_path }}" - - - name: Format swap file - ansible.builtin.command: "mkswap {{ swap_path }}" - -- when: swap_enabled | bool - block: - - name: Fix file permissions - ansible.builtin.file: - path: "{{ swap_path }}" - owner: root - group: root - mode: "0600" - - - name: Mount swap file - ansible.posix.mount: - src: "{{ swap_path }}" - path: none - fstype: swap - state: present - - - name: Enable swap - ansible.builtin.command: "swapon -a" - changed_when: False +- name: Create swap file + ansible.builtin.include_tasks: create.yml + when: swap_enabled | bool