feat: use new token for register

.forgejo/workflows/molecule.yml

@@ -0,0 +1,18 @@
+---
+on: [push]
+jobs:
+  lint:
+    runs-on: docker
+    container:
+      image: code.waks.be/nishiki/molecule:docker
+    steps:
+      - uses: actions/checkout@v3
+      - run: ansible-lint .
+      - run: yamllint .
+  molecule:
+    runs-on: docker
+    container:
+      image: code.waks.be/nishiki/molecule:docker
+    steps:
+      - uses: actions/checkout@v3
+      - run: molecule test

.gitlab-ci.yml

@@ -0,0 +1,10 @@
+---
+image: nishiki/molecule:docker
+
+before_script:
+  - molecule --version
+
+molecule:
+  stage: test
+  script:
+    - molecule test

.yamllint

@@ -2,11 +2,11 @@
 extends: default
 
 ignore: |
-  .kitchen/*
+  .kitchen*
   vendor/
+  .forgejo/
 
 rules:
   line-length:
     max: 120
     level: warning
-  truthy: false

CHANGELOG.md

@@ -5,6 +5,19 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+### Added
+
+- test: add support debian 12
+
+### Removed
+
+- test: remove support debian 10
+
+### Changed
+
+- test: use personal docker registry
+- feat: use new token for registrer
+
 ## [v1.0.0] - 2020-08-09
 
 - first version

README.md

@@ -1,14 +1,17 @@
 # Ansible role: Gitlab Runner
 
-[![Version](https://img.shields.io/badge/latest_version-1.0.0-green.svg)](https://git.yaegashi.fr/nishiki/ansible-role-gitlab/releases)
-[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://git.yaegashi.fr/nishiki/ansible-role-gitlab/src/branch/master/LICENSE)
+[![Version](https://img.shields.io/badge/latest_version-1.0.0-green.svg)](https://code.waks.be/nishiki/ansible-role-gitlab/releases)
+[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://code.waks.be/nishiki/ansible-role-gitlab/src/branch/main/LICENSE)
+[![Build](https://code.waks.be/nishiki/ansible-role-gitlab_runner/actions/workflows/molecule.yml/badge.svg?branch=main)](https://code.waks.be/nishiki/ansible-role-gitlab_runner/actions?workflow=molecule.yml)
 
 Install and configure a Gitlab runner
 
 ## Requirements
 
-* Ansible >= 2.9
-* Debian Buster
+- Ansible >= 2.9
+- Debian
+  - Bullseye
+  - Bookworm
 
 ## Role variables
 
@@ -24,6 +27,12 @@ Install and configure a Gitlab runner
       locked: false
 ```
 
+- `gitlab_runner_env_variables` - dict with environment variables
+
+```
+  HTTP_PROXY: https://127.0.0.1:3218
+```
+
 ## How to use
 
 ```
@@ -36,10 +45,10 @@ Install and configure a Gitlab runner
 
 ### Test with molecule and docker
 
-* install [docker](https://docs.docker.com/engine/installation/)
-* install `python3` and `python3-pip`
-* install molecule and dependencies `pip3 install molecule 'molecule[docker]' docker ansible-lint testinfra yamllint`
-* run `molecule test`
+- install [docker](https://docs.docker.com/engine/installation/)
+- install `python3` and `python3-pip`
+- install molecule and dependencies `pip3 install molecule 'molecule[docker]' docker ansible-lint testinfra yamllint`
+- run `molecule test`
 
 ## License
 

defaults/main.yml

@@ -2,3 +2,4 @@
 gitlab_runner_repository: >
   deb https://packages.gitlab.com/runner/gitlab-runner/debian/ {{ ansible_distribution_release }} main
 gitlab_runner_runners: []
+gitlab_runner_env_variables: {}

handlers/main.yml

@@ -0,0 +1,5 @@
+---
+- name: Restart gitlab-runner
+  ansible.builtin.service:
+    name: gitlab-runner
+    state: restarted

library/gitlab_runner.py

@@ -14,15 +14,19 @@ class GitlabRunner:
       if v is False:
         opts.append('--%s=false' % k)
       else:
-        opts.append('--%s' % k)
-        if v is not True:
-          opts.append(str(v))
+        if isinstance(v, list):
+          for av in v:
+            opts.append('--%s' % k)
+            opts.append(str(av))
+        else:
+          opts.append('--%s' % k)
+          if v is not True:
+            opts.append(str(v))
 
     subprocess.check_call(['gitlab-runner', 'register',
       '--non-interactive',
-      '--name', self.name,
       '--url', url,
-      '--registration-token', token,
+      '--token', token,
       '--executor', executor,
     ] + opts )
 

meta/main.yml

@@ -1,16 +1,18 @@
 ---
 galaxy_info:
   role_name: gitlab_runner
+  namespace: nishiki
   author: Adrien Waksberg
   company: Adrien Waksberg
   description: Install and configure Gitlab runner
   license: Apache2
-  min_ansible_version: 2.9
+  min_ansible_version: "2.9"
 
   platforms:
     - name: Debian
       versions:
-        - buster
+        - bullseye
+        - bookworm
 
   galaxy_tags:
     - git

molecule/default/converge.yml

@@ -4,9 +4,16 @@
   roles:
     - ansible-role-gitlab_runner
   vars:
+    gitlab_runner_env_variables:
+      TEST: toto
     gitlab_runner_runners:
       - name: test
         url: https://gitlab.example.com
         token: TesT
         executor: docker
         state: absent
+
+  pre_tasks:
+    - name: update apt cache
+      ansible.builtin.apt:
+        update_cache: true

molecule/default/molecule.yml

@@ -2,21 +2,27 @@
 driver:
   name: docker
 platforms:
-  - name: debian10
-    image: nishiki/debian10:molecule
+  - name: debian12
+    image: code.waks.be/nishiki/molecule:debian12
     privileged: true
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    command: /bin/systemd
+    capabilities:
+      - SYS_ADMIN
+  - name: debian11
+    image: code.waks.be/nishiki/molecule:debian11
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     command: /bin/systemd
     capabilities:
       - SYS_ADMIN
-    exposed_ports:
-      - 22/tcp
-    published_ports:
-      - 0.0.0.0:2222:22/tcp
 lint: |
   set -e
   yamllint .
-  ansible-lint
+  ansible-lint .
 verifier:
   name: testinfra

molecule/default/tests/test_default.py

@@ -4,6 +4,15 @@ def test_packages(host):
   package = host.package('gitlab-runner')
   assert package.is_installed
 
+def test_env_file(host):
+  path = host.file('/etc/systemd/system/gitlab-runner.service.d/ansible.conf')
+  assert path.exists
+  assert path.is_file
+  assert path.user == 'root'
+  assert path.group == 'root'
+  assert path.mode == 0o644
+  assert path.contains('Environment="TEST=toto"')
+
 def test_config_file(host):
   config = host.file('/etc/gitlab-runner/config.toml')
   assert config.exists

tasks/main.yml

@@ -1,36 +1,56 @@
 ---
-- name: add gpg key
-  apt_key:
+- name: Add gpg key
+  ansible.builtin.apt_key:
     url: https://packages.gitlab.com/runner/gitlab-runner/gpgkey
   tags: gitlab-runner
 
-- name: add repository
-  apt_repository:
-    repo: '{{ gitlab_runner_repository }}'
+- name: Add repository
+  ansible.builtin.apt_repository:
+    repo: "{{ gitlab_runner_repository }}"
   tags: gitlab-runner
 
-- name: install package
-  package:
-    name: gitlab-runner
+- name: Install package
+  ansible.builtin.package:
+    name:
+      - gitlab-runner
   environment:
-    GITLAB_RUNNER_DISABLE_SKEL: 'true'
+    GITLAB_RUNNER_DISABLE_SKEL: "true"
   tags: gitlab-runner
 
-- name: register runners
+- name: Create system directory
+  ansible.builtin.file:
+    path: /etc/systemd/system/gitlab-runner.service.d
+    owner: root
+    group: root
+    mode: 0755
+    state: directory
+  tags: gitlab-runner
+
+- name: Add environment variables
+  ansible.builtin.template:
+    src: environment.conf.j2
+    dest: /etc/systemd/system/gitlab-runner.service.d/ansible.conf
+    owner: root
+    group: root
+    mode: 0644
+  notify: Restart gitlab-runner
+  tags: gitlab-runner
+
+- name: Register runners
   gitlab_runner:
-    name: '{{ item.name }}'
-    url: '{{ item.url }}'
-    token: '{{ item.token }}'
-    executor: '{{ item.executor }}'
-    options: '{{ item.options|default({}) }}'
-    state: '{{ item.state|default("present") }}'
-  loop: '{{ gitlab_runner_runners }}'
+    name: "{{ item.name }}"
+    url: "{{ item.url }}"
+    token: "{{ item.token }}"
+    executor: "{{ item.executor }}"
+    options: "{{ item.options | default({}) }}"
+    state: "{{ item.state | default('present') }}"
+  loop: "{{ gitlab_runner_runners }}"
   loop_control:
-    label: '{{ item.name }}'
+    label: "{{ item.name }}"
   tags: gitlab-runner
 
-- name: enable and start service
-  service:
+- name: Enable and start service
+  ansible.builtin.service:
     name: gitlab-runner
     state: started
     enabled: true

templates/environment.conf.j2

@@ -0,0 +1,6 @@
+# {{ ansible_managed }}
+
+[Service]
+{% for env, value in gitlab_runner_env_variables.items()  %}
+Environment="{{ env }}={{ value }}"
+{% endfor %}