diff --git a/.drone.jsonnet b/.drone.jsonnet
index 4b304ac..fab0391 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -132,11 +132,11 @@ local PipelineNotification = {
steps: [
{
name: 'matrix',
- image: 'plugins/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 }}) ({{ build.branch }}) by {{ build.author }}
Message: {{ build.message }}',
+ template: 'Status: **{{ build.Status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}
Message: {{ commit.Message.Title }}',
username: { from_secret: 'matrix_username' },
password: { from_secret: 'matrix_password' },
},
diff --git a/.drone.yml b/.drone.yml
index 1d67377..b26499f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,129 +1,152 @@
---
kind: pipeline
name: linting
+
platform:
- arch: amd64
os: linux
+ arch: amd64
+
steps:
-- commands:
- - ansible-later
- image: thegeeklab/ansible-later
- name: ansible-later
-- commands:
- - pip install -qq yapf
- - '[ ! -z "$(find . -type f -name *.py)" ] && yapf -rd ./'
- environment:
- PY_COLORS: 1
- image: python:3.9
- name: python-format
-- commands:
- - pip install -qq flake8
- - flake8
- environment:
- PY_COLORS: 1
- image: python:3.9
- name: python-flake8
+ - name: ansible-later
+ image: thegeeklab/ansible-later
+ commands:
+ - ansible-later
+
+ - name: python-format
+ image: python:3.9
+ commands:
+ - pip install -qq yapf
+ - "[ ! -z \"$(find . -type f -name *.py)\" ] && yapf -rd ./"
+ environment:
+ PY_COLORS: 1
+
+ - name: python-flake8
+ image: python:3.9
+ commands:
+ - pip install -qq flake8
+ - flake8
+ environment:
+ PY_COLORS: 1
+
trigger:
ref:
- - refs/heads/master
- - refs/tags/**
- - refs/pull/**
+ - refs/heads/master
+ - refs/tags/**
+ - refs/pull/**
+
---
-concurrency:
- limit: 1
-depends_on:
-- linting
kind: pipeline
name: testing-centos7
+
platform:
- arch: amd64
os: linux
-steps:
-- commands:
- - molecule test -s centos7
- environment:
- HCLOUD_TOKEN:
- from_secret: hcloud_token
- image: thegeeklab/molecule:3
- name: ansible-molecule
-trigger:
- ref:
- - refs/heads/master
- - refs/tags/**
+ arch: amd64
+
+concurrency:
+ limit: 1
+
workspace:
base: /drone/src
path: ${DRONE_REPO_NAME}
----
+
+steps:
+ - name: ansible-molecule
+ image: thegeeklab/molecule:3
+ commands:
+ - molecule test -s centos7
+ environment:
+ HCLOUD_TOKEN:
+ from_secret: hcloud_token
+
+trigger:
+ ref:
+ - refs/heads/master
+ - refs/tags/**
+
depends_on:
-- testing-centos7
+ - linting
+
+---
kind: pipeline
name: documentation
+
platform:
- arch: amd64
os: linux
+ arch: amd64
+
steps:
-- 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
- image: thegeeklab/ansible-doctor
- name: generate
-- image: plugins/gh-pages
- name: publish
- 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/master
+ - 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/master
+
trigger:
ref:
- - refs/heads/master
- - refs/tags/**
- - refs/pull/**
----
-clone:
- disable: true
+ - refs/heads/master
+ - refs/tags/**
+ - refs/pull/**
+
depends_on:
-- documentation
+ - testing-centos7
+
+---
kind: pipeline
name: notification
+
platform:
- arch: amd64
os: linux
+ arch: amd64
+
+clone:
+ disable: true
+
steps:
-- image: plugins/matrix
- name: 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 }}) ({{ build.branch }}) by {{ build.author }}
Message:
- {{ build.message }}'
- username:
- from_secret: matrix_username
+ - 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 }}){{/if}} by {{ commit.Author }}
Message: {{ commit.Message.Title }}"
+ username:
+ from_secret: matrix_username
+
trigger:
ref:
- - refs/heads/master
- - refs/tags/**
+ - refs/heads/master
+ - refs/tags/**
status:
- - success
- - failure
+ - success
+ - failure
+
+depends_on:
+ - documentation
+
---
kind: signature
-hmac: 4fcdc523a498578d8709af38eb2b7d7e2c2c5d8170b811d97a6058a0bafa7335
+hmac: 837559e8d0f35e92970cd947a6419c5df859e60cc8e9c328a42c9233ef1ff2c2
...