Gitlab-CI: ansible-lint

.gitlab-ci.yml

@@ -0,0 +1,13 @@
+image: python:3-slim
+
+before_script:
+  - pip install ansible-lint
+  - ansible-lint --version
+
+stages:
+  - ansible-lint
+
+ansible-lint:
+  stage: ansible-lint
+  script:
+    - ansible-lint .

.gitmodules

@@ -37,3 +37,6 @@
 [submodule "roles/geerlingguy.gitlab"]
 	path = roles/geerlingguy.gitlab
 	url = https://github.com/geerlingguy/ansible-role-gitlab
+[submodule "roles/riemers.gitlab-runner"]
+	path = roles/riemers.gitlab-runner
+	url = https://github.com/riemers/ansible-gitlab-runner

group_vars/gitlabrunner.yml

@@ -9,3 +9,12 @@
   pip_package: python3-pip
   pip_install_packages:
     - name: python-gitlab
+  ### riemers.gitlab-runner
+  gitlab_runner_coordinator_url: https://git.mgrote.net
+  gitlab_runner_registration_token: "{{ lookup('keepass', 'gitlab_runner_registration_token', 'password') }}"
+  gitlab_runner_runners:
+    - name: "{{ ansible_hostname }}-docker"
+      executor: docker
+      docker_image: 'alpine'
+      docker_volumes:
+        - "/var/run/docker.sock:/var/run/docker.sock"

host_vars/gitlab-runner-staging.grote.lan.yml

@@ -1,10 +0,0 @@
----
-  ### mgrote.gitlab-runner
-  gitlab_runner:
-    - api_url: https://git.mgrote.net
-      registration_token: "{{ lookup('keepass', 'gitlab_runner_registration_token', 'password') }}"
-      api_token: "{{ lookup('keepass', 'gitlab_runner_api_token', 'password') }}" #Token: ansible-gitlab-runner
-      api_username: root
-      description: "{{ ansible_hostname }}"
-      active: "false"
-      state: "absent"

host_vars/gitlab-runner-test.grote.lan.yml

@@ -1,10 +0,0 @@
----
-  ### mgrote.gitlab-runner
-  gitlab_runner:
-    - api_url: https://git.mgrote.net
-      registration_token: "{{ lookup('keepass', 'gitlab_runner_registration_token', 'password') }}"
-      api_token: "{{ lookup('keepass', 'gitlab_runner_api_token', 'password') }}" #Token: ansible-gitlab-runner
-      api_username: root
-      description: "{{ ansible_hostname }}"
-      active: "false"
-      state: "absent"

host_vars/gitlab-runner.grote.lan.yml

@@ -1,10 +0,0 @@
----
-  ### mgrote.gitlab-runner
-  gitlab_runner:
-    - api_url: https://git.mgrote.net
-      registration_token: "{{ lookup('keepass', 'gitlab_runner_registration_token', 'password') }}"
-      api_token: "{{ lookup('keepass', 'gitlab_runner_api_token', 'password') }}" #Token: ansible-gitlab-runner
-      api_username: root
-      description: "{{ ansible_hostname }}"
-      active: "true"
-      state: "present"

playbooks/service/gitlab-runner.yml

@@ -4,4 +4,4 @@
     - { role: geerlingguy.pip, tags: "pip", become: true }
     - { role: geerlingguy.docker, tags: "docker", become: true }
     - { role: gantsign.ctop, tags: "ctop", become: true }
-    - { role: mgrote.gitlab-runner, tags: "gitlab-runner", become: true }
+    - { role: riemers.gitlab-runner, tags: "gitlab-runner", become: true }

roles/riemers.gitlab-runner

@@ -0,0 +1 @@
+Subproject commit 860652c8a2b61d2b93a42aaca6895caaf757afef