From 165cc65dc59c2a66dfbb756748bbcccebe1a7173 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 22 Jan 2020 22:08:44 +0100 Subject: [PATCH] refactor docs --- .drone.jsonnet | 262 ++++++++++++++++++++++++++----------------------- .drone.yml | 46 +++++---- HEADER.md | 4 - 3 files changed, 166 insertions(+), 146 deletions(-) delete mode 100644 HEADER.md diff --git a/.drone.jsonnet b/.drone.jsonnet index 23f9939..5291717 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,141 +1,155 @@ local PipelineLinting = { - kind: "pipeline", - name: "linting", - platform: { - os: "linux", - arch: "amd64", - }, - steps: [ - { - name: "ansible-later", - image: "xoxys/ansible-later:latest", - commands: [ - "ansible-later", - ], - }, - ], - trigger: { - ref: ["refs/heads/master", "refs/tags/**", "refs/pull/**"], + kind: 'pipeline', + name: 'linting', + platform: { + os: 'linux', + arch: 'amd64', + }, + steps: [ + { + name: 'ansible-later', + image: 'xoxys/ansible-later:latest', + commands: [ + 'ansible-later', + ], }, + ], + trigger: { + ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + }, }; -local PipelineDeployment = { - kind: "pipeline", - name: "deployment", - platform: { - os: "linux", - arch: "amd64", - }, - concurrency: { - limit: 1 - }, - workspace: { - base: "/drone/src", - path: "xoxys.ntp" - }, - steps: [ - { - name: "ansible-molecule", - image: "xoxys/molecule:latest", - environment: { - DO_API_KEY: { "from_secret": "do_api_key" }, - USER: "root", - MOLECULE_CUSTOM_MODULES_REPO: "https://gitea.rknet.org/ansible/custom_modules", - MOLECULE_CUSTOM_FILTERS_REPO: "https://gitea.rknet.org/ansible/custom_filters", - }, - commands: [ - "molecule test -s default", - ], - }, - ], - depends_on: [ - "linting", - ], - trigger: { - ref: ["refs/heads/master", "refs/tags/**"], +local PipelineDeployment(scenario='centos7') = { + kind: 'pipeline', + name: 'testing-' + scenario, + platform: { + os: 'linux', + arch: 'amd64', + }, + concurrency: { + limit: 1, + }, + workspace: { + base: '/drone/src', + path: 'xoxys.ntp', + }, + steps: [ + { + name: 'ansible-molecule', + image: 'xoxys/molecule:latest', + environment: { + DO_API_KEY: { from_secret: 'do_api_key' }, + USER: 'root', + MOLECULE_CUSTOM_MODULES_REPO: 'https://gitea.rknet.org/ansible/custom_modules', + MOLECULE_CUSTOM_FILTERS_REPO: 'https://gitea.rknet.org/ansible/custom_filters', + }, + commands: [ + 'molecule test -s' + scenario, + ], }, + ], + depends_on: [ + 'linting', + ], + trigger: { + ref: ['refs/heads/master', 'refs/tags/**'], + }, }; local PipelineDocumentation = { - kind: "pipeline", - name: "documentation", - platform: { - os: "linux", - arch: "amd64", + kind: 'pipeline', + name: 'documentation', + platform: { + os: 'linux', + arch: 'amd64', + }, + steps: [ + { + name: 'generate', + image: 'xoxys/ansible-doctor:latest', + environment: { + ANSIBLE_DOCTOR_LOG_LEVEL: 'INFO', + ANSIBLE_DOCTOR_FORCE_OVERWRITE: true, + ANSIBLE_DOCTOR_EXCLUDE_FILES: 'molecule/', + ANSIBLE_DOCTOR_TEMPLATE: 'hugo-book', + ANSIBLE_DOCTOR_ROLE_NAME: '${DRONE_REPO_NAME#*.}', + ANSIBLE_DOCTOR_OUTPUT_DIR: '_docs/', + }, }, - steps: [ - { - name: "ansible-doctor", - image: "xoxys/ansible-doctor:latest", - environment: { - ANSIBLE_DOCTOR_LOG_LEVEL: "INFO", - ANSIBLE_DOCTOR_FORCE_OVERWRITE: true, - ANSIBLE_DOCTOR_EXCLUDE_FILES: "molecule/", - ANSIBLE_DOCTOR_CUSTOM_HEADER: "HEADER.md", - }, - }, - { - name: "push-to-repo", - image: "plugins/git-action:latest", - settings: { - actions: ["commit", "push"], - author_email: "shipper@rknet.org", - author_name: "DroneShipper", - branch: "master", - message: "[SKIP CI] update readme", - remote: "https://gitea.rknet.org/ansible/xoxys.ntp", - netrc_machine: "gitea.rknet.org", - netrc_username: {"from_secret": "gitea_username"}, - netrc_password: {"from_secret": "gitea_token"}, - }, - when: { - ref: ["refs/heads/master"], - }, - }, - ], - depends_on: [ - "deployment", - ], - trigger: { - ref: ["refs/heads/master", "refs/tags/**", "refs/pull/**"], + { + name: 'publish', + image: 'plugins/gh-pages:latest', + settings: { + remote_url: 'https://gitea.rknet.org/ansible/xoxys.ntp', + netrc_machine: 'gitea.rknet.org', + username: { from_secret: 'gitea_username' }, + password: { from_secret: 'gitea_token' }, + pages_directory: '_docs/', + target_branch: 'docs', + }, + when: { + ref: ['refs/heads/master'], + }, }, + { + name: 'trigger', + image: 'plugins/downstream', + settings: { + server: 'https://drone.rknet.org', + token: { from_secret: 'drone_token' }, + fork: true, + repositories: [ + 'ansible/ansible-galaxy', + ], + }, + when: { + ref: ['refs/heads/master'], + }, + }, + ], + trigger: { + ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + }, + depends_on: [ + 'testing-centos7', + ], }; -local PipelineNotification= { - kind: "pipeline", - name: "notification", - platform: { - os: "linux", - arch: "amd64", - }, - clone: { - disable: true, - }, - steps: [ - { - name: "matrix", - image: "plugins/matrix", - settings: { - homeserver: { "from_secret": "matrix_homeserver" }, - roomid: { "from_secret": "matrix_roomid" }, - template: "Status: **{{ build.status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}
Message: {{ build.message }}", - username: { "from_secret": "matrix_username" }, - password: { "from_secret": "matrix_password" }, - }, - }, - ], - depends_on: [ - "documentation", - ], - trigger: { - status: [ "success", "failure" ], - ref: ["refs/heads/master", "refs/tags/**"], +local PipelineNotification = { + kind: 'pipeline', + name: 'notification', + platform: { + os: 'linux', + arch: 'amd64', + }, + clone: { + disable: true, + }, + steps: [ + { + name: 'matrix', + image: 'plugins/matrix', + settings: { + homeserver: { from_secret: 'matrix_homeserver' }, + roomid: { from_secret: 'matrix_roomid' }, + template: 'Status: **{{ build.status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}
Message: {{ build.message }}', + username: { from_secret: 'matrix_username' }, + password: { from_secret: 'matrix_password' }, + }, }, + ], + depends_on: [ + 'documentation', + ], + trigger: { + status: ['success', 'failure'], + ref: ['refs/heads/master', 'refs/tags/**'], + }, }; [ - PipelineLinting, - PipelineDeployment, - PipelineDocumentation, - PipelineNotification, + PipelineLinting, + PipelineDeployment(scenario='centos7'), + PipelineDocumentation, + PipelineNotification, ] diff --git a/.drone.yml b/.drone.yml index eb4cfe3..7648e81 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,7 @@ trigger: --- kind: pipeline -name: deployment +name: testing-centos7 platform: os: linux @@ -37,7 +37,7 @@ steps: - name: ansible-molecule image: xoxys/molecule:latest commands: - - molecule test -s default + - molecule test -scentos7 environment: DO_API_KEY: from_secret: do_api_key @@ -62,30 +62,40 @@ platform: arch: amd64 steps: -- name: ansible-doctor +- name: generate image: xoxys/ansible-doctor:latest environment: - ANSIBLE_DOCTOR_CUSTOM_HEADER: HEADER.md ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/ ANSIBLE_DOCTOR_FORCE_OVERWRITE: true ANSIBLE_DOCTOR_LOG_LEVEL: INFO + ANSIBLE_DOCTOR_OUTPUT_DIR: _docs/ + ANSIBLE_DOCTOR_ROLE_NAME: ${DRONE_REPO_NAME#*.} + ANSIBLE_DOCTOR_TEMPLATE: hugo-book -- name: push-to-repo - image: plugins/git-action:latest +- name: publish + image: plugins/gh-pages:latest settings: - actions: - - commit - - push - author_email: shipper@rknet.org - author_name: DroneShipper - branch: master - message: "[SKIP CI] update readme" netrc_machine: gitea.rknet.org - netrc_password: + pages_directory: _docs/ + password: from_secret: gitea_token - netrc_username: + remote_url: https://gitea.rknet.org/ansible/xoxys.ntp + target_branch: docs + username: from_secret: gitea_username - remote: https://gitea.rknet.org/ansible/xoxys.ntp + when: + ref: + - refs/heads/master + +- name: trigger + image: plugins/downstream + settings: + fork: true + repositories: + - ansible/ansible-galaxy + server: https://drone.rknet.org + token: + from_secret: drone_token when: ref: - refs/heads/master @@ -97,7 +107,7 @@ trigger: - refs/pull/** depends_on: -- deployment +- testing-centos7 --- kind: pipeline @@ -137,6 +147,6 @@ depends_on: --- kind: signature -hmac: 4d8fb85e5aa1dbc571dc31405c9c2caa13282c2d297171f8aedbc5cdda5c910b +hmac: 2e102826ebc1537b91e252d6e7c5e68634f42af716979e03726e238b6db54b31 ... diff --git a/HEADER.md b/HEADER.md deleted file mode 100644 index 22b3c40..0000000 --- a/HEADER.md +++ /dev/null @@ -1,4 +0,0 @@ -# xoxys.ntp - -[![Build Status](https://drone.rknet.org/api/badges/ansible/xoxys.ntp/status.svg)](https://drone.rknet.org/ansible/xoxys.ntp) -