From 7bf7dd7b668d03398a808c937ffaf7cc66fb7942 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 | 11 ++--------- .drone.yml | 26 ++++++++++---------------- .later.yml | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 25 deletions(-) create mode 100644 .later.yml diff --git a/.drone.jsonnet b/.drone.jsonnet index 92288a2..234a132 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", ], }, ], @@ -40,16 +36,14 @@ local PipelineDeployment = { steps: [ { name: "ansible-molecule", - image: "xoxys/molecule:do-linux-amd64", + image: "xoxys/molecule:latest", environment: { DO_API_KEY: { "from_secret": "do_api_key" }, USER: "root", MOLECULE_CUSTOM_MODULES_REPO: "https://gitea.rknet.org/ansible/custom_modules", MOLECULE_CUSTOM_FILTERS_REPO: "https://gitea.rknet.org/ansible/custom_filters", - PY_COLORS: 1 }, commands: [ - "/bin/bash /docker-entrypoint.sh", "molecule test -s default", ], }, @@ -78,7 +72,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 c3fa7f6..739c888 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 @@ -38,22 +35,20 @@ workspace: steps: - name: ansible-molecule - image: xoxys/molecule:do-linux-amd64 + image: xoxys/molecule:latest commands: - - /bin/bash /docker-entrypoint.sh - molecule test -s default environment: DO_API_KEY: from_secret: do_api_key MOLECULE_CUSTOM_FILTERS_REPO: https://gitea.rknet.org/ansible/custom_filters MOLECULE_CUSTOM_MODULES_REPO: https://gitea.rknet.org/ansible/custom_modules - PY_COLORS: 1 USER: root trigger: ref: - refs/heads/master - - "refs/tags/**" + - refs/tags/** depends_on: - linting @@ -74,7 +69,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 @@ -82,7 +76,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" @@ -99,8 +93,8 @@ steps: trigger: ref: - refs/heads/master - - "refs/tags/**" - - "refs/pull/**" + - refs/tags/** + - refs/pull/** depends_on: - deployment @@ -133,7 +127,7 @@ steps: trigger: ref: - refs/heads/master - - "refs/tags/**" + - refs/tags/** status: - success - failure @@ -143,6 +137,6 @@ depends_on: --- kind: signature -hmac: 17f9b58b6ccc3675fe5d1b425680c2316f1a1d4002f35d3509dcb477c05c9b02 +hmac: 05491ce303dcf1f92b0b6b474f0fc63ee1104e1588d331985e411bf2ffb4c8ed ... diff --git a/.later.yml b/.later.yml new file mode 100644 index 0000000..45911c9 --- /dev/null +++ b/.later.yml @@ -0,0 +1,18 @@ +--- +ansible: + custom_modules: + - iptables_raw + - openssl_pkcs12 + - proxmox_kvm2 + - ucr + - yum_versionlock + +rules: + exclude_files: + - molecule/ + - "LICENSE*" + - "**/*.md" + - "**/*.ini" + + exclude_filter: + - LINT0009