From ad4ec5db39466fe3e5960ec67aa8952cb93570dc Mon Sep 17 00:00:00 2001 From: Simon Cornet Date: Fri, 13 Jun 2025 11:49:36 +0200 Subject: [PATCH] feat(ci): move linting to components --- .gitlab-ci.yml | 6 +++++- .gitlab/linting.yaml | 30 ------------------------------ readme.md | 16 +++++++++++----- 3 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 .gitlab/linting.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fdb0b13..ffbf34d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,5 +14,9 @@ include: # deployment - local: ".gitlab/gitleaks.yaml" - - local: ".gitlab/linting.yaml" - local: ".gitlab/deployment.yaml" + + # linting + - component: "$CI_SERVER_FQDN/components/ansiblelint/ansiblelint@1.0.0" + - component: "$CI_SERVER_FQDN/components/markdownlint/markdownlint@1.0.0" + - component: "$CI_SERVER_FQDN/components/yamllint/yamllint@1.0.2" diff --git a/.gitlab/linting.yaml b/.gitlab/linting.yaml deleted file mode 100644 index 5361ac6..0000000 --- a/.gitlab/linting.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- - -# linting -ansible-lint: - stage: "linting" - image: "docker.io/pipelinecomponents/ansible-lint:0.79.0" - rules: - - # run only on push to default branch - - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - - when: "never" - - # start linting - script: - - "ansible-lint -c .ansible-lint ." - -# yamllint -yamllint: - stage: "linting" - image: "registry.gitlab.com/pipeline-components/yamllint:0.35.0" - rules: - - # run only on push to default branch - - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - - when: "never" - - script: - - # run yamllint - - "yamllint ." diff --git a/readme.md b/readme.md index 577d95d..2953990 100644 --- a/readme.md +++ b/readme.md @@ -1,14 +1,17 @@ # Overview + This role manages the build-in 'core' Operating System components and defaults tailored for Siempie. -# Supported Operating Systems +## Supported Operating Systems + | Operating System | Version | | --- | ----- | | Debian | 12 | | Ubuntu | 22 LTS | | Ubuntu | 24 LTS | -# Tags +## Tags + - apt - cron - environment-file @@ -30,8 +33,10 @@ This role manages the build-in 'core' Operating System components and defaults t - timezone - usermanagement -# Vars -## apt +## vars + +### apt + | variable | type | value(default) | comment | | --- | --- | --- | --- | | apt_automatic_reboot_time | string | 04:00 | Automated reboot at 04:00 | @@ -42,7 +47,8 @@ This role manages the build-in 'core' Operating System components and defaults t | apt_repository_main | string | https://archive.ubuntu.com/ubuntu | Ubuntu 24+ | | apt_repository_security | string | https://archive.ubuntu.com/ubuntu | Ubuntu 24+ | -## ntp +### ntp + | variable | type | value(default) | comment | | --- | --- | --- | --- | | ntp_server | string | pool.ntp.org | NTP server to sync time with |