From f8c3b1796fdb03340508c8804ab890cd71b1f4ea Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 21 Mar 2020 14:35:14 +0100 Subject: [PATCH] cleanup drone config --- .drone.jsonnet | 5 ++--- .drone.yml | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 0080da4..bdf05a6 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -31,13 +31,12 @@ local PipelineDeployment(scenario='centos7') = { }, workspace: { base: '/drone/src', - path: 'xoxys.lvm', + path: '${DRONE_REPO_NAME}', }, steps: [ { name: 'ansible-molecule', image: 'xoxys/molecule:3', - pull: 'always', environment: { DO_API_KEY: { from_secret: 'do_api_key' }, MOLECULE_CUSTOM_MODULES_REPO: 'https://gitea.rknet.org/ansible/custom_modules', @@ -80,7 +79,7 @@ local PipelineDocumentation = { name: 'publish', image: 'plugins/gh-pages', settings: { - remote_url: 'https://gitea.rknet.org/ansible/xoxys.lvm', + remote_url: 'https://gitea.rknet.org/ansible/${DRONE_REPO_NAME}', netrc_machine: 'gitea.rknet.org', username: { from_secret: 'gitea_username' }, password: { from_secret: 'gitea_token' }, diff --git a/.drone.yml b/.drone.yml index ea27ded..a50fee7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ concurrency: workspace: base: /drone/src - path: xoxys.lvm + path: ${DRONE_REPO_NAME} steps: - name: ansible-molecule @@ -65,7 +65,7 @@ concurrency: workspace: base: /drone/src - path: xoxys.lvm + path: ${DRONE_REPO_NAME} steps: - name: ansible-molecule @@ -112,7 +112,7 @@ steps: pages_directory: _docs/ password: from_secret: gitea_token - remote_url: https://gitea.rknet.org/ansible/xoxys.lvm + remote_url: https://gitea.rknet.org/ansible/${DRONE_REPO_NAME} target_branch: docs username: from_secret: gitea_username @@ -181,6 +181,6 @@ depends_on: --- kind: signature -hmac: dae646b5c218d3a8ef3b7940f23f38f54e121fb3b96feff5e331c91563e324a4 +hmac: 10808886cd7ccfcbb3a117f08697fb108e8d61be1f73589d16697eb75906e902 ...