From 6269006cb16b3c1afbcd9f235ecd24b00a56e5d2 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 556bd25..22d7062 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -31,13 +31,12 @@ local PipelineDeployment(scenario='centos7') = { }, workspace: { base: '/drone/src', - path: 'xoxys.gitea', + 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.gitea', + 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 67b861d..9717ddb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ concurrency: workspace: base: /drone/src - path: xoxys.gitea + 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.gitea + 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: f8899f5c091fd02359b1e142ad105aa66fe6a4d68839c6260c2b6f40a8487e1e +hmac: 5997a45449c9e688c64c7fef283d7462de2abe61e6942e34989d39416608d35e ...