From 881d18786e692a8aa5fb12f3fb21449dc882be1f 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 c9a039f..22d7062 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -31,13 +31,12 @@ local PipelineDeployment(scenario='centos7') = { }, workspace: { base: '/drone/src', - path: 'xoxys.droneci', + 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.droneci', + 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 39e1de0..be495ec 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ concurrency: workspace: base: /drone/src - path: xoxys.droneci + 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.droneci + 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: 9ee775888ada1a156d643569e6096741428f547f9ec4649228fc62b5733df4f8 +hmac: 954a017fb7f99bf27a09d15decf793cd6b40b7e020df5164eb58a746e2a9b996 ...