From ce377b6e9041d140d244d95ac736e611f7db7d62 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 f59b241..bdf05a6 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -31,13 +31,12 @@ local PipelineDeployment(scenario='centos7') = { }, workspace: { base: '/drone/src', - path: 'xoxys.cacerts', + 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.cacerts', + 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 8a82edc..4c48be2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ concurrency: workspace: base: /drone/src - path: xoxys.cacerts + path: ${DRONE_REPO_NAME} steps: - name: ansible-molecule @@ -65,7 +65,7 @@ concurrency: workspace: base: /drone/src - path: xoxys.cacerts + 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.cacerts + 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: 6c8e9a1be000b95b2863962d78c018f95f8557dd9e9cd26d9083a514316e5797 +hmac: 3dcae10b5d720f294d3af4d77d15072014c96dee6804ab1f03da3b407d8ab4eb ...