From 7c3925f56a9d28e6cad236f3711e7d65fb76e521 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 3 Feb 2024 22:33:14 +0100 Subject: [PATCH] ci: migrate to woodpecker --- .drone.jsonnet | 159 ------------------ .drone.yml | 153 ----------------- .later.yml | 3 - .prettierignore | 2 +- .woodpecker/docs.yaml | 42 +++++ .woodpecker/lint.yaml | 30 ++++ .woodpecker/notify.yml | 26 +++ .woodpecker/test.yaml | 25 +++ meta/main.yml | 5 +- molecule/default | 1 - molecule/{rocky9 => default}/converge.yml | 0 molecule/default/molecule.yml | 17 ++ molecule/{rocky9 => default}/prepare.yml | 15 +- .../{rocky9 => default}/tests/test_default.py | 1 - molecule/pytest.ini | 3 - molecule/requirements.yml | 2 - molecule/rocky9/create.yml | 120 ------------- molecule/rocky9/default | 1 - molecule/rocky9/destroy.yml | 78 --------- molecule/rocky9/molecule.yml | 24 --- pyproject.toml | 19 +++ setup.cfg | 12 -- tasks/main.yml | 105 ++++++------ 23 files changed, 223 insertions(+), 620 deletions(-) delete mode 100644 .drone.jsonnet delete mode 100644 .drone.yml create mode 100644 .woodpecker/docs.yaml create mode 100644 .woodpecker/lint.yaml create mode 100644 .woodpecker/notify.yml create mode 100644 .woodpecker/test.yaml delete mode 120000 molecule/default rename molecule/{rocky9 => default}/converge.yml (100%) create mode 100644 molecule/default/molecule.yml rename molecule/{rocky9 => default}/prepare.yml (50%) rename molecule/{rocky9 => default}/tests/test_default.py (96%) delete mode 100644 molecule/pytest.ini delete mode 100644 molecule/rocky9/create.yml delete mode 120000 molecule/rocky9/default delete mode 100644 molecule/rocky9/destroy.yml delete mode 100644 molecule/rocky9/molecule.yml create mode 100644 pyproject.toml delete mode 100644 setup.cfg diff --git a/.drone.jsonnet b/.drone.jsonnet deleted file mode 100644 index 226614e..0000000 --- a/.drone.jsonnet +++ /dev/null @@ -1,159 +0,0 @@ -local PipelineLinting = { - kind: 'pipeline', - name: 'linting', - platform: { - os: 'linux', - arch: 'amd64', - }, - steps: [ - { - name: 'ansible-later', - image: 'thegeeklab/ansible-later', - commands: [ - 'ansible-later', - ], - }, - { - name: 'python-format', - image: 'python:3.11', - environment: { - PY_COLORS: 1, - }, - commands: [ - 'pip install -qq yapf', - '[ ! -z "$(find . -type f -name *.py)" ] && yapf -rd ./', - ], - }, - { - name: 'python-flake8', - image: 'python:3.11', - environment: { - PY_COLORS: 1, - }, - commands: [ - 'pip install -qq flake8', - 'flake8', - ], - }, - ], - trigger: { - ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], - }, -}; - -local PipelineDeployment(scenario='rocky9') = { - kind: 'pipeline', - name: 'testing-' + scenario, - platform: { - os: 'linux', - arch: 'amd64', - }, - concurrency: { - limit: 1, - }, - workspace: { - base: '/drone/src', - path: '${DRONE_REPO_NAME}', - }, - steps: [ - { - name: 'ansible-molecule', - image: 'thegeeklab/molecule:4', - environment: { - HCLOUD_TOKEN: { from_secret: 'hcloud_token' }, - }, - commands: [ - 'molecule test -s ' + scenario, - ], - }, - ], - depends_on: [ - 'linting', - ], - trigger: { - ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], - }, -}; - -local PipelineDocumentation = { - kind: 'pipeline', - name: 'documentation', - platform: { - os: 'linux', - arch: 'amd64', - }, - steps: [ - { - name: 'generate', - image: 'thegeeklab/ansible-doctor', - environment: { - ANSIBLE_DOCTOR_LOG_LEVEL: 'INFO', - ANSIBLE_DOCTOR_FORCE_OVERWRITE: true, - ANSIBLE_DOCTOR_EXCLUDE_FILES: 'molecule/', - ANSIBLE_DOCTOR_TEMPLATE: 'hugo-book', - ANSIBLE_DOCTOR_ROLE_NAME: '${DRONE_REPO_NAME#*.}', - ANSIBLE_DOCTOR_OUTPUT_DIR: '_docs/', - }, - }, - { - name: 'publish', - image: 'plugins/gh-pages', - settings: { - remote_url: 'https://gitea.rknet.org/ansible/${DRONE_REPO_NAME}', - netrc_machine: 'gitea.rknet.org', - username: { from_secret: 'gitea_username' }, - password: { from_secret: 'gitea_token' }, - pages_directory: '_docs/', - target_branch: 'docs', - }, - when: { - ref: ['refs/heads/main'], - }, - }, - ], - trigger: { - ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], - }, - depends_on: [ - 'testing-rocky9', - ], -}; - -local PipelineNotification = { - kind: 'pipeline', - name: 'notification', - platform: { - os: 'linux', - arch: 'amd64', - }, - clone: { - disable: true, - }, - steps: [ - { - name: 'matrix', - image: 'thegeeklab/drone-matrix', - settings: { - homeserver: { from_secret: 'matrix_homeserver' }, - roomid: { from_secret: 'matrix_roomid' }, - template: 'Status: **{{ .Build.Status }}**
Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}
Message: {{ .Commit.Message.Title }}', - username: { from_secret: 'matrix_username' }, - password: { from_secret: 'matrix_password' }, - }, - }, - ], - depends_on: [ - 'documentation', - ], - trigger: { - status: ['success', 'failure'], - ref: ['refs/heads/main', 'refs/tags/**'], - }, -}; - -[ - PipelineLinting, - PipelineDeployment(scenario='rocky9'), - PipelineDocumentation, - PipelineNotification, -] diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index dbd0dbe..0000000 --- a/.drone.yml +++ /dev/null @@ -1,153 +0,0 @@ ---- -kind: pipeline -name: linting - -platform: - os: linux - arch: amd64 - -steps: - - name: ansible-later - image: thegeeklab/ansible-later - commands: - - ansible-later - - - name: python-format - image: python:3.11 - commands: - - pip install -qq yapf - - "[ ! -z \"$(find . -type f -name *.py)\" ] && yapf -rd ./" - environment: - PY_COLORS: 1 - - - name: python-flake8 - image: python:3.11 - commands: - - pip install -qq flake8 - - flake8 - environment: - PY_COLORS: 1 - -trigger: - ref: - - refs/heads/main - - refs/tags/** - - refs/pull/** - ---- -kind: pipeline -name: testing-rocky9 - -platform: - os: linux - arch: amd64 - -concurrency: - limit: 1 - -workspace: - base: /drone/src - path: ${DRONE_REPO_NAME} - -steps: - - name: ansible-molecule - image: thegeeklab/molecule:4 - commands: - - molecule test -s rocky9 - environment: - HCLOUD_TOKEN: - from_secret: hcloud_token - -trigger: - ref: - - refs/heads/main - - refs/tags/** - - refs/pull/** - -depends_on: - - linting - ---- -kind: pipeline -name: documentation - -platform: - os: linux - arch: amd64 - -steps: - - name: generate - image: thegeeklab/ansible-doctor - environment: - ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/ - ANSIBLE_DOCTOR_FORCE_OVERWRITE: true - ANSIBLE_DOCTOR_LOG_LEVEL: INFO - ANSIBLE_DOCTOR_OUTPUT_DIR: _docs/ - ANSIBLE_DOCTOR_ROLE_NAME: ${DRONE_REPO_NAME#*.} - ANSIBLE_DOCTOR_TEMPLATE: hugo-book - - - name: publish - image: plugins/gh-pages - settings: - netrc_machine: gitea.rknet.org - pages_directory: _docs/ - password: - from_secret: gitea_token - remote_url: https://gitea.rknet.org/ansible/${DRONE_REPO_NAME} - target_branch: docs - username: - from_secret: gitea_username - when: - ref: - - refs/heads/main - -trigger: - ref: - - refs/heads/main - - refs/tags/** - - refs/pull/** - -depends_on: - - testing-rocky9 - ---- -kind: pipeline -name: notification - -platform: - os: linux - arch: amd64 - -clone: - disable: true - -steps: - - name: matrix - image: thegeeklab/drone-matrix - settings: - homeserver: - from_secret: matrix_homeserver - password: - from_secret: matrix_password - roomid: - from_secret: matrix_roomid - template: "Status: **{{ .Build.Status }}**
Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}
Message: {{ .Commit.Message.Title }}" - username: - from_secret: matrix_username - -trigger: - ref: - - refs/heads/main - - refs/tags/** - status: - - success - - failure - -depends_on: - - documentation - ---- -kind: signature -hmac: 81536c79ea3dcf2f503450427b9aa5faeb29d613cb1da19b8605010295561341 - -... diff --git a/.later.yml b/.later.yml index 0efe5d5..8ae3cb2 100644 --- a/.later.yml +++ b/.later.yml @@ -14,6 +14,3 @@ rules: - "LICENSE*" - "**/*.md" - "**/*.ini" - - exclude_filter: - - LINT0009 diff --git a/.prettierignore b/.prettierignore index ef05acb..6b1d0bf 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1 @@ -.drone* +LICENSE diff --git a/.woodpecker/docs.yaml b/.woodpecker/docs.yaml new file mode 100644 index 0000000..30b9368 --- /dev/null +++ b/.woodpecker/docs.yaml @@ -0,0 +1,42 @@ +--- +when: + - event: [pull_request] + - event: [push, manual] + branch: + - ${CI_REPO_DEFAULT_BRANCH} + +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: ${DRONE_REPO_NAME} + ANSIBLE_DOCTOR_TEMPLATE: readme + + - name: diff + image: quay.io/thegeeklab/alpine-tools + commands: + - git diff --color=always README.md + + - name: publish + image: quay.io/thegeeklab/drone-git-action + settings: + action: + - commit + - push + author_email: ci-bot@rknet.org + author_name: ci-bot + branch: main + message: "[skip ci] automated docs update" + netrc_machine: gitea.rknet.org + netrc_password: + from_secret: gitea_token + when: + - event: [push, manual] + branch: + - ${CI_REPO_DEFAULT_BRANCH} + +depends_on: + - test diff --git a/.woodpecker/lint.yaml b/.woodpecker/lint.yaml new file mode 100644 index 0000000..f2ad5dc --- /dev/null +++ b/.woodpecker/lint.yaml @@ -0,0 +1,30 @@ +--- +when: + - event: [pull_request, tag] + - event: [push, manual] + branch: + - ${CI_REPO_DEFAULT_BRANCH} + +steps: + - name: ansible-later + image: quay.io/thegeeklab/ansible-later:4 + commands: + - ansible-later + environment: + FORCE_COLOR: 1 + + - name: python-format + image: docker.io/python:3.12 + commands: + - pip install -qq ruff + - ruff format --check --diff . + environment: + PY_COLORS: 1 + + - name: python-lint + image: docker.io/python:3.12 + commands: + - pip install -qq ruff + - ruff . + environment: + PY_COLORS: 1 diff --git a/.woodpecker/notify.yml b/.woodpecker/notify.yml new file mode 100644 index 0000000..9957125 --- /dev/null +++ b/.woodpecker/notify.yml @@ -0,0 +1,26 @@ +--- +when: + - event: [tag] + - event: [push, manual] + branch: + - ${CI_REPO_DEFAULT_BRANCH} + +runs_on: [success, failure] + +steps: + - name: matrix + image: quay.io/thegeeklab/wp-matrix + settings: + homeserver: + from_secret: matrix_homeserver + password: + from_secret: matrix_password + roomid: + from_secret: matrix_roomid + username: + from_secret: matrix_username + when: + - status: [success, failure] + +depends_on: + - docs diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml new file mode 100644 index 0000000..a4991f7 --- /dev/null +++ b/.woodpecker/test.yaml @@ -0,0 +1,25 @@ +--- +when: + - event: [pull_request, tag] + - event: [push, manual] + branch: + - ${CI_REPO_DEFAULT_BRANCH} + +variables: + - &molecule_base + image: quay.io/thegeeklab/molecule:6 + group: molecule + secrets: + - source: molecule_hcloud_token + target: HCLOUD_TOKEN + environment: + PY_COLORS: "1" + +steps: + - name: molecule-default + <<: *molecule_base + commands: + - molecule test -s default + +depends_on: + - lint diff --git a/meta/main.yml b/meta/main.yml index 71f42d0..d1d6aec 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,4 +1,3 @@ -# Standards: 0.2 --- galaxy_info: # @meta author:value: [Robert Kaussow](https://gitea.rknet.org/xoxys) @@ -14,10 +13,10 @@ galaxy_info: # @end description: Setup Podman container manager license: MIT - min_ansible_version: 2.10 + min_ansible_version: "2.10" platforms: - name: EL versions: - - 7 + - "7" galaxy_tags: [] dependencies: [] diff --git a/molecule/default b/molecule/default deleted file mode 120000 index afa9fc6..0000000 --- a/molecule/default +++ /dev/null @@ -1 +0,0 @@ -rocky9 \ No newline at end of file diff --git a/molecule/rocky9/converge.yml b/molecule/default/converge.yml similarity index 100% rename from molecule/rocky9/converge.yml rename to molecule/default/converge.yml diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml new file mode 100644 index 0000000..1f3cd4d --- /dev/null +++ b/molecule/default/molecule.yml @@ -0,0 +1,17 @@ +--- +driver: + name: molecule_hetznercloud +dependency: + name: galaxy + options: + role-file: molecule/requirements.yml + requirements-file: molecule/requirements.yml +platforms: + - name: "rocky9-podman" + server_type: "cx11" + image: "rocky-9" +provisioner: + name: ansible + log: False +verifier: + name: testinfra diff --git a/molecule/rocky9/prepare.yml b/molecule/default/prepare.yml similarity index 50% rename from molecule/rocky9/prepare.yml rename to molecule/default/prepare.yml index 183f4d3..3f1ce5e 100644 --- a/molecule/rocky9/prepare.yml +++ b/molecule/default/prepare.yml @@ -1,15 +1,20 @@ --- - name: Prepare hosts: all - gather_facts: false + gather_facts: False tasks: - name: Bootstrap python for Ansible raw: | command -v python3 python || ( - (test -e /usr/bin/dnf && sudo dnf install -y python3) || (test -e /usr/bin/apt && (apt -y update && apt install -y python-minimal)) || - (test -e /usr/bin/yum && sudo yum -y -qq install python3) || echo "Warning: Python not boostrapped due to unknown platform." ) - become: true - changed_when: false + changed_when: False + + - name: Wait for apt lock + shell: while fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do echo 'Waiting for apt list lock.' && sleep 10; done + changed_when: False + + - name: Update package cache + apt: + update_cache: True diff --git a/molecule/rocky9/tests/test_default.py b/molecule/default/tests/test_default.py similarity index 96% rename from molecule/rocky9/tests/test_default.py rename to molecule/default/tests/test_default.py index b35a03b..27be564 100644 --- a/molecule/rocky9/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -1,4 +1,3 @@ -import pytest import os import testinfra.utils.ansible_runner diff --git a/molecule/pytest.ini b/molecule/pytest.ini deleted file mode 100644 index c24fe5b..0000000 --- a/molecule/pytest.ini +++ /dev/null @@ -1,3 +0,0 @@ -[pytest] -filterwarnings = - ignore::DeprecationWarning diff --git a/molecule/requirements.yml b/molecule/requirements.yml index 503f85b..ababebd 100644 --- a/molecule/requirements.yml +++ b/molecule/requirements.yml @@ -1,7 +1,5 @@ --- collections: - - name: https://gitea.rknet.org/ansible/xoxys.general/releases/download/v2.1.1/xoxys-general-2.1.1.tar.gz - - name: community.general - name: containers.podman roles: [] diff --git a/molecule/rocky9/create.yml b/molecule/rocky9/create.yml deleted file mode 100644 index 719600d..0000000 --- a/molecule/rocky9/create.yml +++ /dev/null @@ -1,120 +0,0 @@ ---- -- name: Create - hosts: localhost - connection: local - gather_facts: false - no_log: "{{ molecule_no_log }}" - vars: - ssh_port: 22 - ssh_user: root - ssh_path: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/ssh_key" - tasks: - - name: Create SSH key - user: - name: "{{ lookup('env', 'USER') }}" - generate_ssh_key: true - ssh_key_file: "{{ ssh_path }}" - force: true - register: generated_ssh_key - - - name: Register the SSH key name - set_fact: - ssh_key_name: "molecule-generated-{{ 12345 | random | to_uuid }}" - - - name: Register SSH key for test instance(s) - hcloud_ssh_key: - name: "{{ ssh_key_name }}" - public_key: "{{ generated_ssh_key.ssh_public_key }}" - state: present - - - name: Create molecule instance(s) - hcloud_server: - name: "{{ item.name }}" - server_type: "{{ item.server_type }}" - ssh_keys: - - "{{ ssh_key_name }}" - image: "{{ item.image }}" - location: "{{ item.location | default(omit) }}" - datacenter: "{{ item.datacenter | default(omit) }}" - user_data: "{{ item.user_data | default(omit) }}" - api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}" - state: present - register: server - loop: "{{ molecule_yml.platforms }}" - async: 7200 - poll: 0 - - - name: Wait for instance(s) creation to complete - async_status: - jid: "{{ item.ansible_job_id }}" - register: hetzner_jobs - until: hetzner_jobs.finished - retries: 300 - loop: "{{ server.results }}" - - - name: Create volume(s) - hcloud_volume: - name: "{{ item.name }}" - server: "{{ item.name }}" - location: "{{ item.location | default(omit) }}" - size: "{{ item.volume_size | default(10) }}" - api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}" - state: "present" - loop: "{{ molecule_yml.platforms }}" - when: item.volume | default(False) | bool - register: volumes - async: 7200 - poll: 0 - - - name: Wait for volume(s) creation to complete - async_status: - jid: "{{ item.ansible_job_id }}" - register: hetzner_volumes - until: hetzner_volumes.finished - retries: 300 - when: volumes.changed - loop: "{{ volumes.results }}" - - # Mandatory configuration for Molecule to function. - - - name: Populate instance config dict - set_fact: - instance_conf_dict: - { - "instance": "{{ item.hcloud_server.name }}", - "ssh_key_name": "{{ ssh_key_name }}", - "address": "{{ item.hcloud_server.ipv4_address }}", - "user": "{{ ssh_user }}", - "port": "{{ ssh_port }}", - "identity_file": "{{ ssh_path }}", - "volume": "{{ item.item.item.volume | default(False) | bool }}", - } - loop: "{{ hetzner_jobs.results }}" - register: instance_config_dict - when: server.changed | bool - - - name: Convert instance config dict to a list - set_fact: - instance_conf: "{{ instance_config_dict.results | map(attribute='ansible_facts.instance_conf_dict') | list }}" - when: server.changed | bool - - - name: Dump instance config - copy: - content: | - # Molecule managed - - {{ instance_conf | to_nice_yaml(indent=2) }} - dest: "{{ molecule_instance_config }}" - when: server.changed | bool - - - name: Wait for SSH - wait_for: - port: "{{ ssh_port }}" - host: "{{ item.address }}" - search_regex: SSH - delay: 10 - loop: "{{ lookup('file', molecule_instance_config) | from_yaml }}" - - - name: Wait for VM to settle down - pause: - seconds: 30 \ No newline at end of file diff --git a/molecule/rocky9/default b/molecule/rocky9/default deleted file mode 120000 index 331d858..0000000 --- a/molecule/rocky9/default +++ /dev/null @@ -1 +0,0 @@ -default \ No newline at end of file diff --git a/molecule/rocky9/destroy.yml b/molecule/rocky9/destroy.yml deleted file mode 100644 index ed0b2ed..0000000 --- a/molecule/rocky9/destroy.yml +++ /dev/null @@ -1,78 +0,0 @@ ---- -- name: Destroy - hosts: localhost - connection: local - gather_facts: false - no_log: "{{ molecule_no_log }}" - tasks: - - name: Check existing instance config file - stat: - path: "{{ molecule_instance_config }}" - register: cfg - - - name: Populate the instance config - set_fact: - instance_conf: "{{ (lookup('file', molecule_instance_config) | from_yaml) if cfg.stat.exists else [] }}" - - - name: Destroy molecule instance(s) - hcloud_server: - name: "{{ item.instance }}" - api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}" - state: absent - register: server - loop: "{{ instance_conf }}" - async: 7200 - poll: 0 - - - name: Wait for instance(s) deletion to complete - async_status: - jid: "{{ item.ansible_job_id }}" - register: hetzner_jobs - until: hetzner_jobs.finished - retries: 300 - loop: "{{ server.results }}" - - - pause: - seconds: 5 - - - name: Destroy volume(s) - hcloud_volume: - name: "{{ item.instance }}" - server: "{{ item.instance }}" - api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}" - state: "absent" - register: volumes - loop: "{{ instance_conf }}" - when: item.volume | default(False) | bool - async: 7200 - poll: 0 - - - name: Wait for volume(s) deletion to complete - async_status: - jid: "{{ item.ansible_job_id }}" - register: hetzner_volumes - until: hetzner_volumes.finished - retries: 300 - when: volumes.changed - loop: "{{ volumes.results }}" - - - name: Remove registered SSH key - hcloud_ssh_key: - name: "{{ instance_conf[0].ssh_key_name }}" - state: absent - when: (instance_conf | default([])) | length > 0 - - # Mandatory configuration for Molecule to function. - - - name: Populate instance config - set_fact: - instance_conf: {} - - - name: Dump instance config - copy: - content: | - # Molecule managed - - {{ instance_conf | to_nice_yaml(indent=2) }} - dest: "{{ molecule_instance_config }}" - when: server.changed | bool \ No newline at end of file diff --git a/molecule/rocky9/molecule.yml b/molecule/rocky9/molecule.yml deleted file mode 100644 index 73cfed1..0000000 --- a/molecule/rocky9/molecule.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -dependency: - name: galaxy - options: - role-file: molecule/requirements.yml - requirements-file: molecule/requirements.yml - env: - ANSIBLE_GALAXY_DISPLAY_PROGRESS: "false" -driver: - name: delegated -platforms: - - name: rocky9-podman - image: rocky-9 - server_type: cx11 -lint: | - /usr/local/bin/flake8 -provisioner: - name: ansible - env: - ANSIBLE_FILTER_PLUGINS: ${ANSIBLE_FILTER_PLUGINS:-./plugins/filter} - ANSIBLE_LIBRARY: ${ANSIBLE_LIBRARY:-./library} - log: False -verifier: - name: testinfra diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..d0f36cd --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,19 @@ +[tool.ruff] +exclude = [".git","__pycache__"] + +line-length = 99 +indent-width = 4 + +ignore = ["W191", "E111", "E114", "E117", "S101", "S105"] +select = ["F", "E", "I", "W", "S"] + +[tool.ruff.format] +quote-style = "double" +indent-style = "space" +line-ending = "lf" + +[tool.pytest.ini_options] +filterwarnings = [ + "ignore::FutureWarning", + "ignore::DeprecationWarning", +] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 2bb8674..0000000 --- a/setup.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[flake8] -ignore = D100, D101, D102, D103, D105, D107, E402, W503 -max-line-length = 99 -inline-quotes = double -exclude = .git,.tox,__pycache__,build,dist,tests,*.pyc,*.egg-info,.cache,.eggs,env* - -[yapf] -based_on_style = google -column_limit = 99 -dedent_closing_brackets = true -coalesce_brackets = true -split_before_logical_operator = true diff --git a/tasks/main.yml b/tasks/main.yml index bd9810e..9e2db4c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,61 +1,58 @@ --- -- block: - - name: Ensure required packages are installed - package: - name: "{{ item }}" - state: "present" - loop: - - podman - - container-selinux - - bash-completion +- name: Ensure required packages are installed + ansible.builtin.package: + name: "{{ item }}" + state: "present" + loop: + - podman + - container-selinux + - bash-completion - - name: Install Podman bash-completion - command: - cmd: "podman completion bash -f /etc/bash_completion.d/podman" - creates: "/etc/bash_completion.d/podman" +- name: Install Podman bash-completion + ansible.builtin.command: + cmd: "podman completion bash -f /etc/bash_completion.d/podman" + creates: "/etc/bash_completion.d/podman" - - name: Deploy container configuration - template: - src: etc/containers/containers.conf.j2 - dest: /etc/containers/containers.conf - owner: root - group: root - mode: 0644 +- name: Deploy container configuration + ansible.builtin.template: + src: etc/containers/containers.conf.j2 + dest: /etc/containers/containers.conf + owner: root + group: root + mode: "0644" - - name: Deploy storage configuration - template: - src: etc/containers/storage.conf.j2 - dest: /etc/containers/storage.conf - owner: root - group: root - mode: 0644 +- name: Deploy storage configuration + ansible.builtin.template: + src: etc/containers/storage.conf.j2 + dest: /etc/containers/storage.conf + owner: root + group: root + mode: "0644" - - name: Set SELinux booleans - seboolean: - name: "{{ item.name }}" - state: "{{ item.state | bool }}" - persistent: "{{ item.persistent | default(True) | bool }}" - loop: "{{ podman_sebooleans }}" - loop_control: - label: "{{ item.name }}: {{ item.state | bool }}" +- name: Set SELinux booleans + ansible.posix.seboolean: + name: "{{ item.name }}" + state: "{{ item.state | bool }}" + persistent: "{{ item.persistent | default(True) | bool }}" + loop: "{{ podman_sebooleans }}" + loop_control: + label: "{{ item.name }}: {{ item.state | bool }}" - - name: Configure namespace id range - lineinfile: - dest: "{{ item }}" - regexp: "^containers:" - line: "containers:{{ podman_nsremap_range_start }}:{{ podman_nsremap_range_length }}" - loop: - - /etc/subuid - - /etc/subgid +- name: Configure namespace id range + ansible.builtin.lineinfile: + dest: "{{ item }}" + regexp: "^containers:" + line: "containers:{{ podman_nsremap_range_start }}:{{ podman_nsremap_range_length }}" + loop: + - /etc/subuid + - /etc/subgid - - name: Handle registry logins - containers.podman.podman_login: - registry: "{{ item.url | default(omit) }}" - username: "{{ item.username }}" - password: "{{ item.password }}" - state: '{{ item.state | default("present") }}' - loop: "{{ podman_registries }}" - loop_control: - label: "{{ item.url }}" - become: True - become_user: root +- name: Handle registry logins + containers.podman.podman_login: + registry: "{{ item.url | default(omit) }}" + username: "{{ item.username }}" + password: "{{ item.password }}" + state: '{{ item.state | default("present") }}' + loop: "{{ podman_registries }}" + loop_control: + label: "{{ item.url }}"