From 31bc9723da68bd1f780a8192f8b442dc42be4c09 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 | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index f022158..22d7062 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -31,13 +31,12 @@ local PipelineDeployment(scenario='centos7') = { }, workspace: { base: '/drone/src', - path: 'xoxys.postfix_relay', + 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.postfix_relay', + 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 ee8b76a..7649735 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ concurrency: workspace: base: /drone/src - path: xoxys.postfix_relay + path: ${DRONE_REPO_NAME} steps: - name: ansible-molecule @@ -78,7 +78,7 @@ steps: pages_directory: _docs/ password: from_secret: gitea_token - remote_url: https://gitea.rknet.org/ansible/xoxys.postfix_relay + remote_url: https://gitea.rknet.org/ansible/${DRONE_REPO_NAME} target_branch: docs username: from_secret: gitea_username @@ -146,6 +146,6 @@ depends_on: --- kind: signature -hmac: d33c5c45165070d064029f5fd125e6a4f361819cfa302a3203cc0bbf31cd6b8f +hmac: 6eab61d0752e138193d7e74e0de73f97755b16091ffbcf191283e68f27b5b90a ...