cleanup drone config

This commit is contained in:
Robert Kaussow 2020-03-21 14:35:14 +01:00
parent 6ede26e376
commit f31addde5f
3 changed files with 6 additions and 8 deletions

View File

@ -31,13 +31,12 @@ local PipelineDeployment(scenario='centos7') = {
}, },
workspace: { workspace: {
base: '/drone/src', base: '/drone/src',
path: 'xoxys.zigbee2mqtt', path: '${DRONE_REPO_NAME}',
}, },
steps: [ steps: [
{ {
name: 'ansible-molecule', name: 'ansible-molecule',
image: 'xoxys/molecule:3', image: 'xoxys/molecule:3',
pull: 'always',
environment: { environment: {
DO_API_KEY: { from_secret: 'do_api_key' }, DO_API_KEY: { from_secret: 'do_api_key' },
MOLECULE_CUSTOM_MODULES_REPO: 'https://gitea.rknet.org/ansible/custom_modules', MOLECULE_CUSTOM_MODULES_REPO: 'https://gitea.rknet.org/ansible/custom_modules',
@ -80,7 +79,7 @@ local PipelineDocumentation = {
name: 'publish', name: 'publish',
image: 'plugins/gh-pages', image: 'plugins/gh-pages',
settings: { settings: {
remote_url: 'https://gitea.rknet.org/ansible/xoxys.zigbee2mqtt', remote_url: 'https://gitea.rknet.org/ansible/${DRONE_REPO_NAME}',
netrc_machine: 'gitea.rknet.org', netrc_machine: 'gitea.rknet.org',
username: { from_secret: 'gitea_username' }, username: { from_secret: 'gitea_username' },
password: { from_secret: 'gitea_token' }, password: { from_secret: 'gitea_token' },

View File

@ -31,7 +31,7 @@ concurrency:
workspace: workspace:
base: /drone/src base: /drone/src
path: xoxys.zigbee2mqtt path: ${DRONE_REPO_NAME}
steps: steps:
- name: ansible-molecule - name: ansible-molecule
@ -78,7 +78,7 @@ steps:
pages_directory: _docs/ pages_directory: _docs/
password: password:
from_secret: gitea_token from_secret: gitea_token
remote_url: https://gitea.rknet.org/ansible/xoxys.zigbee2mqtt remote_url: https://gitea.rknet.org/ansible/${DRONE_REPO_NAME}
target_branch: docs target_branch: docs
username: username:
from_secret: gitea_username from_secret: gitea_username
@ -146,6 +146,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: b629e99dc2598189aa6098a35cca02a35713d411d585266f29aa0160ba3501b1 hmac: 3dcde97a565209f6740ba11221bc41f96334425e47bb9ed6f89cc63048e2ab50
... ...

View File

@ -30,8 +30,7 @@
- name: Install nodejs dependencies - name: Install nodejs dependencies
npm: npm:
path: "{{ zigbee2mqtt_base_dir }}" path: "{{ zigbee2mqtt_base_dir }}" environment:
environment:
PATH: "{{ __zigbee2mqtt_npm_executable | dirname }}:{{ ansible_env.PATH }}" PATH: "{{ __zigbee2mqtt_npm_executable | dirname }}:{{ ansible_env.PATH }}"
notify: __zigbee2mqtt_restart notify: __zigbee2mqtt_restart
when: zigbee2mqtt_version is version(zigbee2mqtt_current_version, ">") when: zigbee2mqtt_version is version(zigbee2mqtt_current_version, ">")