From 2328ec526c7e0a6044b3aafd4c61438f5c6b7212 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 22 Nov 2019 23:59:05 +0100 Subject: [PATCH] cleanup pipeline --- .drone.jsonnet | 7 +------ .drone.yml | 20 ++++++++------------ .later.yml | 16 +++++++++++++++- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index eec8aa8..673c6b4 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -9,12 +9,8 @@ local PipelineLinting = { { name: "ansible-later", image: "xoxys/ansible-later:latest", - environment: { - PY_COLORS: 1 - }, commands: [ - "git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy", - "ansible-later -c ~/policy/config.yml" + "ansible-later", ], }, ], @@ -39,7 +35,6 @@ local PipelineDocumentation = { ANSIBLE_DOCTOR_FORCE_OVERWRITE: true, ANSIBLE_DOCTOR_EXCLUDE_FILES: "molecule/", ANSIBLE_DOCTOR_CUSTOM_HEADER: "HEADER.md", - PY_COLORS: 1 }, }, { diff --git a/.drone.yml b/.drone.yml index 282f094..afbd94a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,16 +10,13 @@ steps: - name: ansible-later image: xoxys/ansible-later:latest commands: - - git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy - - ansible-later -c ~/policy/config.yml - environment: - PY_COLORS: 1 + - ansible-later trigger: ref: - refs/heads/master - - "refs/tags/**" - - "refs/pull/**" + - refs/tags/** + - refs/pull/** --- kind: pipeline @@ -37,7 +34,6 @@ steps: ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/ ANSIBLE_DOCTOR_FORCE_OVERWRITE: true ANSIBLE_DOCTOR_LOG_LEVEL: INFO - PY_COLORS: 1 - name: push-to-repo image: plugins/git-action:latest @@ -45,7 +41,7 @@ steps: actions: - commit - push - author_email: "shipper@rknet.org" + author_email: shipper@rknet.org author_name: DroneShipper branch: master message: "[SKIP CI] update readme" @@ -62,8 +58,8 @@ steps: trigger: ref: - refs/heads/master - - "refs/tags/**" - - "refs/pull/**" + - refs/tags/** + - refs/pull/** depends_on: - linting @@ -96,7 +92,7 @@ steps: trigger: ref: - refs/heads/master - - "refs/tags/**" + - refs/tags/** status: - success - failure @@ -106,6 +102,6 @@ depends_on: --- kind: signature -hmac: 0563b25e341275e8df6b60e49553ebb3585684acdf657c849fffee3c55e305fd +hmac: 5f63a1f7efb946ff1a28ef8c860a1ac2fbbc28cc944128569b76aea63ffec708 ... diff --git a/.later.yml b/.later.yml index 9927d9b..45911c9 100644 --- a/.later.yml +++ b/.later.yml @@ -1,4 +1,18 @@ --- +ansible: + custom_modules: + - iptables_raw + - openssl_pkcs12 + - proxmox_kvm2 + - ucr + - yum_versionlock + rules: + exclude_files: + - molecule/ + - "LICENSE*" + - "**/*.md" + - "**/*.ini" + exclude_filter: - - ANSIBLE0009 + - LINT0009