Skip to content

Commit 560eca7

Browse files
Several changes
[feature] Restart service when version changed [change] the way how the role find the runner systemd service name [change] uninstall runner service using svc.sh script [change] removed service_name variable [change] removed runner_on_ghes variable as it is no more needed [change] code refactoring/simplification [fix] support 150 characters long service name
1 parent 61e9d22 commit 560eca7

File tree

14 files changed

+123
-290
lines changed

14 files changed

+123
-290
lines changed

defaults/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ runner_name: "{{ ansible_hostname }}"
5151
# Will the runner be deployed on Github Enterprise server?
5252
runner_on_ghes: no
5353

54-
# Custom service name when using Github Enterprise server
55-
# DEPRECATED: this variable is deprecated in favor of "runner_on_ghes" and will be removed in release 1.15.
56-
# service_name: actions.runner._services.{{ runner_name }}.service
57-
5854
# GitHub Repository user or Organization owner used for Runner registration
5955
# github_account: "youruser"
6056

handlers/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
- name: Restart runner service
44
service:
55
name: "{{ runner_service }}"
6-
state: restarted
6+
state: restarted

molecule/default/cleanup.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
- github_repo: ansible-github_actions_runner-testrepo
99
- github_account: monolithprojects-testorg
1010
- runner_state: absent
11+
- runner_name: test_name
1112
roles:
1213
- ansible-github_actions_runner

molecule/default/converge.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
- runner_user: ansible
99
- github_repo: ansible-github_actions_runner-testrepo
1010
- github_account: monolithprojects-testorg
11-
- runner_version: "latest"
12-
- service_name: awesome
11+
- runner_version: latest
12+
- runner_name: test_name
13+
- runner_on_ghes: yes
14+
- reinstall_runner: false
15+
- hide_sensitive_logs: no
1316
- runner_labels:
1417
- label1
1518
- repo-runner

molecule/org/converge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
- github_account: monolithprojects-testorg
99
- runner_org: yes
1010
- runner_state: "stopped"
11-
- runner_version: "2.274.2"
11+
- runner_version: "2.287.0"
1212
roles:
1313
- robertdebock.epel
14-
- ansible-github_actions_runner
14+
- ansible-github_actions_runner

molecule/repo/converge.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
- github_repo: ansible-github_actions_runner-testrepo
1010
- github_account: monolithprojects-testorg
1111
- runner_version: "latest"
12-
- runner_labels:
12+
- runner_name: test_runner
13+
- runner_labels:
1314
- label1
1415
- repo-runner
1516
roles:
1617
- robertdebock.epel
17-
- ansible-github_actions_runner
18+
- ansible-github_actions_runner

tasks/assert.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
- github_account is defined
66
fail_msg: "github_account is not defined"
77
run_once: yes
8-
tags:
9-
- install
10-
- uninstall
118

129
- name: Check access_token variable (RUN ONCE)
1310
assert:
@@ -16,27 +13,10 @@
1613
- access_token | length > 0
1714
fail_msg: "access_token was not found or is using an invalid format."
1815
run_once: yes
19-
tags:
20-
- install
21-
- uninstall
2216

2317
- name: Check runner_org variable (RUN ONCE)
2418
assert:
2519
that:
2620
- runner_org == True or runner_org == False
2721
fail_msg: "runner_org should be a boolean value"
2822
run_once: yes
29-
tags:
30-
- install
31-
- uninstall
32-
33-
- name: GHES service_name deprecation check (RUN ONCE)
34-
assert:
35-
that:
36-
- service_name is not defined
37-
fail_msg: '[DEPRECATION WARNING]: Variable "service_name" will is deprecated and will be removed in release 1.15. Start using "running_on_ghes" boolean variable.'
38-
ignore_errors: yes
39-
run_once: yes
40-
tags:
41-
- install
42-
- uninstall

tasks/collect_info.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
- block:
3+
- name: Set complete API url for repo runner
4+
set_fact:
5+
github_full_api_url: "{{ github_api_url }}/repos/{{ github_owner | default(github_account) }}/{{ github_repo }}/actions/runners"
6+
when: not runner_org
7+
8+
- name: Set complete API url for org runner
9+
set_fact:
10+
github_full_api_url: "{{ github_api_url }}/orgs/{{ github_owner | default(github_account) }}/actions/runners"
11+
when: runner_org | bool
12+
13+
- name: Get registration token (RUN ONCE)
14+
uri:
15+
url: "{{ github_full_api_url }}/registration-token"
16+
headers:
17+
Authorization: "token {{ access_token }}"
18+
Accept: "application/vnd.github.v3+json"
19+
method: POST
20+
status_code: 201
21+
force_basic_auth: yes
22+
register: registration
23+
run_once: yes
24+
25+
- name: Check currently registered runners for repo (RUN ONCE)
26+
uri:
27+
url: "{{ github_full_api_url }}"
28+
headers:
29+
Authorization: "token {{ access_token }}"
30+
Accept: "application/vnd.github.v3+json"
31+
method: GET
32+
status_code: 200
33+
force_basic_auth: yes
34+
register: registered_runners
35+
run_once: yes
36+
37+
- name: Check service facts
38+
service_facts:
39+
40+
check_mode: false

tasks/collect_info_org.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

tasks/collect_info_repo.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)