refactor docs

2020-01-22 22:36:03 +01:00 · 2020-01-22 22:36:03 +01:00 · acc88a5f0a
commit acc88a5f0a
parent fe4d94c5d1
3 changed files with 120 additions and 126 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@ -1,137 +1,136 @@
 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.matrix"
-    },
-    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.matrix',
+  },
+  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: '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',
+      },
    },
-    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.matrix",
-                netrc_machine: "gitea.rknet.org",
-                netrc_username: {"from_secret": "gitea_username"},
-                netrc_password: {"from_secret": "gitea_token"},
-            },
-            when: {
-                ref: ["refs/heads/master"],
-            },
-        },
-    ],
-    trigger: {
-        ref: ["refs/heads/master", "refs/tags/**", "refs/pull/**"],
+    {
+      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',
+        netrc_machine: 'gitea.rknet.org',
+        netrc_username: { from_secret: 'gitea_username' },
+        netrc_password: { from_secret: 'gitea_token' },
+      },
+      when: {
+        ref: ['refs/heads/master'],
+      },
    },
+  ],
+  trigger: {
+    ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'],
+  },
 };

-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 }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> 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 }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> 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,
-    PipelineDocumentation,
-    PipelineNotification,
+  PipelineLinting,
+  PipelineDocumentation,
+  PipelineNotification,
 ]
--- a/.drone.yml
+++ b/.drone.yml
@ -50,7 +50,6 @@ steps:
      from_secret: gitea_token
    netrc_username:
      from_secret: gitea_username
-    remote: https://gitea.rknet.org/ansible/xoxys.matrix
  when:
    ref:
    - refs/heads/master
@ -99,6 +98,6 @@ depends_on:

 ---
 kind: signature
-hmac: d5adee42edbe725a89a25e490964ebaf21eb04ad122a00acf0b6e69211d3a2f7
+hmac: 12195a066cda727bc895d6b5f3642dc68a35165f0e1bfa1e3f938136fdbe5c62

 ...
--- a/HEADER.md
+++ b/HEADER.md
@ -1,4 +0,0 @@
-# xoxys.matrix
-  
-[![Build Status](https://drone.rknet.org/api/badges/ansible/xoxys.matrix/status.svg)](https://drone.rknet.org/ansible/xoxys.matrix)
-