[skip ci] fix drone-matrix template

.drone.jsonnet

@@ -15,18 +15,18 @@ local PipelineLinting = {
     },
     {
       name: 'python-format',
-      image: 'python:3.9',
+      image: 'python:3.11',
       environment: {
         PY_COLORS: 1,
       },
       commands: [
         'pip install -qq yapf',
-        '[ -z "$(find .  -type f -name *.py)" ] || (yapf -rd ./)',
+        '[ -z "$(find . -type f -name *.py)" ] || (yapf -rd ./)',
       ],
     },
     {
       name: 'python-flake8',
-      image: 'python:3.9',
+      image: 'python:3.11',
       environment: {
         PY_COLORS: 1,
       },
@@ -37,7 +37,7 @@ local PipelineLinting = {
     },
   ],
   trigger: {
-    ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'],
+    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
   },
 };
 
@@ -58,7 +58,7 @@ local PipelineDeployment(scenario='centos7') = {
   steps: [
     {
       name: 'ansible-molecule',
-      image: 'thegeeklab/molecule:3',
+      image: 'thegeeklab/molecule:4',
       environment: {
         HCLOUD_TOKEN: { from_secret: 'hcloud_token' },
       },
@@ -71,7 +71,7 @@ local PipelineDeployment(scenario='centos7') = {
     'linting',
   ],
   trigger: {
-    ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'],
+    ref: ['refs/heads/main', 'refs/tags/**'],
   },
 };
 
@@ -107,16 +107,15 @@ local PipelineDocumentation = {
         target_branch: 'docs',
       },
       when: {
-        ref: ['refs/heads/master'],
+        ref: ['refs/heads/main'],
       },
     },
   ],
   trigger: {
-    ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'],
+    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
   },
   depends_on: [
     'testing-centos7',
-    'testing-rocky8',
   ],
 };
 
@@ -137,7 +136,7 @@ local PipelineNotification = {
       settings: {
         homeserver: { from_secret: 'matrix_homeserver' },
         roomid: { from_secret: 'matrix_roomid' },
-        template: 'Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}',
+        template: 'Status: **{{ .Build.Status }}**<br/> Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/> Message: {{ .Commit.Message.Title }}',
         username: { from_secret: 'matrix_username' },
         password: { from_secret: 'matrix_password' },
       },
@@ -148,14 +147,13 @@ local PipelineNotification = {
   ],
   trigger: {
     status: ['success', 'failure'],
-    ref: ['refs/heads/master', 'refs/tags/**'],
+    ref: ['refs/heads/main', 'refs/tags/**'],
   },
 };
 
 [
   PipelineLinting,
   PipelineDeployment(scenario='centos7'),
-  PipelineDeployment(scenario='rocky8'),
   PipelineDocumentation,
   PipelineNotification,
 ]

.drone.yml

@@ -13,15 +13,15 @@ steps:
       - ansible-later
 
   - name: python-format
-    image: python:3.9
+    image: python:3.11
     commands:
       - pip install -qq yapf
-      - "[ -z \"$(find .  -type f -name *.py)\" ] || (yapf -rd ./)"
+      - "[ -z \"$(find . -type f -name *.py)\" ] || (yapf -rd ./)"
     environment:
       PY_COLORS: 1
 
   - name: python-flake8
-    image: python:3.9
+    image: python:3.11
     commands:
       - pip install -qq flake8
       - flake8
@@ -30,7 +30,7 @@ steps:
 
 trigger:
   ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/tags/**
     - refs/pull/**
 
@@ -51,7 +51,7 @@ workspace:
 
 steps:
   - name: ansible-molecule
-    image: thegeeklab/molecule:3
+    image: thegeeklab/molecule:4
     commands:
       - molecule test -s centos7
     environment:
@@ -60,42 +60,8 @@ steps:
 
 trigger:
   ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/tags/**
-    - refs/pull/**
-
-depends_on:
-  - linting
-
----
-kind: pipeline
-name: testing-rocky8
-
-platform:
-  os: linux
-  arch: amd64
-
-concurrency:
-  limit: 1
-
-workspace:
-  base: /drone/src
-  path: ${DRONE_REPO_NAME}
-
-steps:
-  - name: ansible-molecule
-    image: thegeeklab/molecule:3
-    commands:
-      - molecule test -s rocky8
-    environment:
-      HCLOUD_TOKEN:
-        from_secret: hcloud_token
-
-trigger:
-  ref:
-    - refs/heads/master
-    - refs/tags/**
-    - refs/pull/**
 
 depends_on:
   - linting
@@ -132,17 +98,16 @@ steps:
         from_secret: gitea_username
     when:
       ref:
-        - refs/heads/master
+        - refs/heads/main
 
 trigger:
   ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/tags/**
     - refs/pull/**
 
 depends_on:
   - testing-centos7
-  - testing-rocky8
 
 ---
 kind: pipeline
@@ -165,13 +130,13 @@ steps:
         from_secret: matrix_password
       roomid:
         from_secret: matrix_roomid
-      template: "Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}"
+      template: "Status: **{{ .Build.Status }}**<br/> Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/> Message: {{ .Commit.Message.Title }}"
       username:
         from_secret: matrix_username
 
 trigger:
   ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/tags/**
   status:
     - success
@@ -182,6 +147,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 2e6f21516ab45e0df4908fb276cd22b80609d08206a5a747b56309fb6ecfc6e7
+hmac: dd4c50b4a9cb81256ef5bfa0d071d0cec4307fe91db4fdc013c4bdf500cd4889
 
 ...

.gitignore

@@ -9,3 +9,5 @@ __pycache__/
 *.py[cod]
 *$py.class
 
+# ---> Docs
+/_docs

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Robert Kaussow <mail@thegeeklab.de>
+Copyright (c) 2022 Robert Kaussow <mail@thegeeklab.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

defaults/main.yml

@@ -9,8 +9,11 @@ droneci_runner_docker_restart_policy: always
 droneci_runner_docker_service_stopped: False
 
 droneci_runner_docker_capacity: 2
-droneci_runner_docker_server: droneci
-droneci_runner_docker_secret: myveryownsecret
+droneci_drone_runner_labels: []
+
+droneci_runner_docker_server_proto: http
+droneci_runner_docker_server_host: droneci
+droneci_runner_docker_server_secret: myveryownsecret
 
 # @var droneci_runner_docker_memory_limit:example: $ "512m"
 # @var droneci_runner_docker_memory_limit: $ "_unset_"

meta/main.yml

@@ -8,7 +8,7 @@ galaxy_info:
   # @meta description: >
   # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.droneci_runner_docker)
   # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.droneci_runner_docker?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.droneci_runner_docker)
-  # [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?label=license)](https://gitea.rknet.org/ansible/xoxys.droneci_runner_docker/src/branch/master/LICENSE)
+  # [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?label=license)](https://gitea.rknet.org/ansible/xoxys.droneci_runner_docker/src/branch/main/LICENSE)
   #
   # Setup Drone CI docker runner
   # @end

molecule/centos7/converge.yml

@@ -6,8 +6,8 @@
   vars:
     dockerengine_packages_extra:
       - epel-release
-      - python3-pip
-      - python3-virtualenv
+      - python-pip
+      - python-virtualenv
     dockerengine_networks:
       - name: droneci_default
     droneci_runner_docker_service_stopped: True

molecule/default

@@ -1 +1 @@
-rocky8
+centos7

molecule/requirements.yml

@@ -7,4 +7,4 @@ roles:
   - src: https://gitea.rknet.org/ansible/xoxys.docker_engine.git
     name: xoxys.docker_engine
     scm: git
-    version: master
+    version: main

molecule/rocky8/converge.yml

@@ -1,17 +0,0 @@
----
-- name: Converge
-  hosts: all
-  environment:
-    PYTHONPATH: /opt/python2/ansible-deps/lib/python2.7/site-packages
-  vars:
-    dockerengine_packages_extra:
-      - epel-release
-      - python3-pip
-      - python3-virtualenv
-    dockerengine_networks:
-      - name: droneci_default
-    droneci_runner_docker_service_stopped: True
-
-  roles:
-    - role: xoxys.docker_engine
-    - role: xoxys.droneci_runner_docker

molecule/rocky8/create.yml

@@ -1,120 +0,0 @@
----
-- name: Create
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  no_log: "{{ molecule_no_log }}"
-  vars:
-    ssh_port: 22
-    ssh_user: root
-    ssh_path: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/ssh_key"
-  tasks:
-    - name: Create SSH key
-      user:
-        name: "{{ lookup('env', 'USER') }}"
-        generate_ssh_key: true
-        ssh_key_file: "{{ ssh_path }}"
-        force: true
-      register: generated_ssh_key
-
-    - name: Register the SSH key name
-      set_fact:
-        ssh_key_name: "molecule-generated-{{ 12345 | random | to_uuid }}"
-
-    - name: Register SSH key for test instance(s)
-      hcloud_ssh_key:
-        name: "{{ ssh_key_name }}"
-        public_key: "{{ generated_ssh_key.ssh_public_key }}"
-        state: present
-
-    - name: Create molecule instance(s)
-      hcloud_server:
-        name: "{{ item.name }}"
-        server_type: "{{ item.server_type }}"
-        ssh_keys:
-          - "{{ ssh_key_name }}"
-        image: "{{ item.image }}"
-        location: "{{ item.location | default(omit) }}"
-        datacenter: "{{ item.datacenter | default(omit) }}"
-        user_data: "{{ item.user_data | default(omit) }}"
-        api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}"
-        state: present
-      register: server
-      loop: "{{ molecule_yml.platforms }}"
-      async: 7200
-      poll: 0
-
-    - name: Wait for instance(s) creation to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: hetzner_jobs
-      until: hetzner_jobs.finished
-      retries: 300
-      loop: "{{ server.results }}"
-
-    - name: Create volume(s)
-      hcloud_volume:
-        name: "{{ item.name }}"
-        server: "{{ item.name }}"
-        location: "{{ item.location | default(omit) }}"
-        size: "{{ item.volume_size | default(10) }}"
-        api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}"
-        state: "present"
-      loop: "{{ molecule_yml.platforms }}"
-      when: item.volume | default(False) | bool
-      register: volumes
-      async: 7200
-      poll: 0
-
-    - name: Wait for volume(s) creation to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: hetzner_volumes
-      until: hetzner_volumes.finished
-      retries: 300
-      when: volumes.changed
-      loop: "{{ volumes.results }}"
-
-    # Mandatory configuration for Molecule to function.
-
-    - name: Populate instance config dict
-      set_fact:
-        instance_conf_dict:
-          {
-            "instance": "{{ item.hcloud_server.name }}",
-            "ssh_key_name": "{{ ssh_key_name }}",
-            "address": "{{ item.hcloud_server.ipv4_address }}",
-            "user": "{{ ssh_user }}",
-            "port": "{{ ssh_port }}",
-            "identity_file": "{{ ssh_path }}",
-            "volume": "{{ item.item.item.volume | default(False) | bool }}",
-          }
-      loop: "{{ hetzner_jobs.results }}"
-      register: instance_config_dict
-      when: server.changed | bool
-
-    - name: Convert instance config dict to a list
-      set_fact:
-        instance_conf: "{{ instance_config_dict.results | map(attribute='ansible_facts.instance_conf_dict') | list }}"
-      when: server.changed | bool
-
-    - name: Dump instance config
-      copy:
-        content: |
-          # Molecule managed
-
-          {{ instance_conf | to_nice_yaml(indent=2) }}
-        dest: "{{ molecule_instance_config }}"
-      when: server.changed | bool
-
-    - name: Wait for SSH
-      wait_for:
-        port: "{{ ssh_port }}"
-        host: "{{ item.address }}"
-        search_regex: SSH
-        delay: 10
-      loop: "{{ lookup('file', molecule_instance_config) | from_yaml }}"
-
-    - name: Wait for VM to settle down
-      pause:
-        seconds: 30

molecule/rocky8/destroy.yml

@@ -1,78 +0,0 @@
----
-- name: Destroy
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  no_log: "{{ molecule_no_log }}"
-  tasks:
-    - name: Check existing instance config file
-      stat:
-        path: "{{ molecule_instance_config }}"
-      register: cfg
-
-    - name: Populate the instance config
-      set_fact:
-        instance_conf: "{{ (lookup('file', molecule_instance_config) | from_yaml) if cfg.stat.exists else [] }}"
-
-    - name: Destroy molecule instance(s)
-      hcloud_server:
-        name: "{{ item.instance }}"
-        api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}"
-        state: absent
-      register: server
-      loop: "{{ instance_conf }}"
-      async: 7200
-      poll: 0
-
-    - name: Wait for instance(s) deletion to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: hetzner_jobs
-      until: hetzner_jobs.finished
-      retries: 300
-      loop: "{{ server.results }}"
-
-    - pause:
-        seconds: 5
-
-    - name: Destroy volume(s)
-      hcloud_volume:
-        name: "{{ item.instance }}"
-        server: "{{ item.instance }}"
-        api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}"
-        state: "absent"
-      register: volumes
-      loop: "{{ instance_conf }}"
-      when: item.volume | default(False) | bool
-      async: 7200
-      poll: 0
-
-    - name: Wait for volume(s) deletion to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: hetzner_volumes
-      until: hetzner_volumes.finished
-      retries: 300
-      when: volumes.changed
-      loop: "{{ volumes.results }}"
-
-    - name: Remove registered SSH key
-      hcloud_ssh_key:
-        name: "{{ instance_conf[0].ssh_key_name }}"
-        state: absent
-      when: (instance_conf | default([])) | length > 0
-
-    # Mandatory configuration for Molecule to function.
-
-    - name: Populate instance config
-      set_fact:
-        instance_conf: {}
-
-    - name: Dump instance config
-      copy:
-        content: |
-          # Molecule managed
-
-          {{ instance_conf | to_nice_yaml(indent=2) }}
-        dest: "{{ molecule_instance_config }}"
-      when: server.changed | bool

molecule/rocky8/molecule.yml

@@ -1,24 +0,0 @@
----
-dependency:
-  name: galaxy
-  options:
-    role-file: molecule/requirements.yml
-    requirements-file: molecule/requirements.yml
-  env:
-    ANSIBLE_GALAXY_DISPLAY_PROGRESS: "false"
-driver:
-  name: delegated
-platforms:
-  - name: rocky8-droneci-runner-docker
-    image: rocky-8
-    server_type: cx11
-lint: |
-  /usr/local/bin/flake8
-provisioner:
-  name: ansible
-  env:
-    ANSIBLE_FILTER_PLUGINS: ${ANSIBLE_FILTER_PLUGINS:-./plugins/filter}
-    ANSIBLE_LIBRARY: ${ANSIBLE_LIBRARY:-./library}
-  log: False
-verifier:
-  name: testinfra

molecule/rocky8/prepare.yml

@@ -1,15 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: false
-  tasks:
-    - name: Bootstrap python for Ansible
-      raw: |
-        command -v python3 python || (
-        (test -e /usr/bin/dnf && sudo dnf install -y python3) ||
-        (test -e /usr/bin/apt && (apt -y update && apt install -y python-minimal)) ||
-        (test -e /usr/bin/yum && sudo yum -y -qq install python3) ||
-        echo "Warning: Python not boostrapped due to unknown platform."
-        )
-      become: true
-      changed_when: false

molecule/rocky8/tests/test_default.py

@@ -1,12 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ["MOLECULE_INVENTORY_FILE"]
-).get_hosts("all")
-
-
-def test_droneci_compose_file(host):
-    f = host.file('/var/lib/docker/services/droneci_runner_docker/docker-compose.yml')
-    assert f.exists

templates/services/droneci_runner_compose.yml.j2

@@ -17,10 +17,13 @@ services:
     {% endif %}
     privileged: true
     environment:
-      - DRONE_RPC_PROTO=http
-      - DRONE_RPC_HOST={{ droneci_runner_docker_server }}
-      - DRONE_RPC_SECRET={{ droneci_runner_docker_secret }}
+      - DRONE_RPC_PROTO={{ droneci_runner_docker_server_proto }}
+      - DRONE_RPC_HOST={{ droneci_runner_docker_server_host }}
+      - DRONE_RPC_SECRET={{ droneci_runner_docker_server_secret }}
       - DRONE_RUNNER_CAPACITY={{ droneci_runner_docker_capacity }}
+      {% if droneci_drone_runner_labels | default([]) | length > 0 %}
+      - DRONE_RUNNER_LABELS={{ droneci_drone_runner_labels | join(",") }}
+      {% endif %}
     {% if droneci_runner_docker_memory_limit is defined %}
     mem_limit: {{ droneci_runner_docker_memory_limit }}
     {% endif %}