Skip to content

Commit 7b8af7d

Browse files
authored
Merge pull request #424 from gwarf/ansible_lint
style: address ansible-lint errors and small clean-up.
2 parents 6fa6a58 + 2b754d3 commit 7b8af7d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+244
-246
lines changed

handlers/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# non macOS
3-
- name: Restart_gitlab_runner
3+
- name: "Restart_gitlab_runner"
44
ansible.builtin.service:
55
name: gitlab-runner
66
state: "{{ gitlab_runner_restart_state }}"
@@ -9,21 +9,21 @@
99
when: ansible_facts['os_family'] != 'Darwin' and ansible_facts['os_family'] != 'Windows' and not gitlab_runner_container_install
1010

1111
# macOS
12-
- name: Restart_gitlab_runner_macos
12+
- name: "Restart_gitlab_runner_macos"
1313
ansible.builtin.command: "{{ gitlab_runner_executable }} restart"
1414
listen: restart_gitlab_runner_macos
1515
become: "{{ gitlab_runner_system_mode }}"
1616
when: ansible_facts['os_family'] == 'Darwin' and gitlab_runner_macos_start_runner
1717

18-
- name: Restart_gitlab_runner_windows
18+
- name: "Restart_gitlab_runner_windows"
1919
ansible.windows.win_command: "{{ gitlab_runner_executable }} restart"
2020
args:
2121
chdir: "{{ gitlab_runner_config_file_location }}"
2222
listen: restart_gitlab_runner_windows
2323
when: ansible_facts['os_family'] == 'Windows' and gitlab_runner_windows_start_runner
2424

2525
# Container
26-
- name: Restart_gitlab_runner_container
26+
- name: "Restart_gitlab_runner_container"
2727
community.docker.docker_container:
2828
name: "{{ gitlab_runner_container_name }}"
2929
restart: true

tasks/config-runner-container.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
check_mode: false
1717
changed_when: false
1818

19-
- name: Update config
19+
- name: "Update config"
2020
ansible.builtin.include_tasks: update-config-runner.yml
2121
vars:
2222
runn_name_prefix: "{{ conf_name_prefix }} runner[{{ (gitlab_runner_index | int) + 1 }}/{{ gitlab_runner_runners | length }}]:"

tasks/config-runner-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
check_mode: false
1616
changed_when: false
1717

18-
- name: Update config
18+
- name: "Update config"
1919
ansible.builtin.include_tasks: update-config-runner-windows.yml
2020
vars:
2121
runn_name_prefix: "{{ conf_name_prefix }} runner[{{ (gitlab_runner_index | int) + 1 }}/{{ gitlab_runner_runners | length }}]:"

tasks/config-runner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
changed_when: false
1818
no_log: "{{ gitlab_runner_no_log_secrets | default(omit) }}"
1919

20-
- name: Update config
20+
- name: "Update config"
2121
ansible.builtin.include_tasks: update-config-runner.yml
2222
vars:
2323
runn_name_prefix: "{{ conf_name_prefix }} runner[{{ (gitlab_runner_index | int) + 1 }}/{{ gitlab_runner_runners | length }}]:"

tasks/config-runners-container.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
---
2-
- name: Get existing config.toml
2+
- name: "Get existing config.toml"
33
ansible.builtin.slurp:
44
src: "{{ gitlab_runner_config_file }}"
55
register: runner_config_file
66

7-
- name: Get pre-existing runner configs
7+
- name: "Get pre-existing runner configs"
88
ansible.builtin.set_fact:
99
runner_configs: "{{ (runner_config_file['content'] | b64decode).split('[[runners]]\n') }}"
1010

11-
- name: Create temporary directory
11+
- name: "Create temporary directory"
1212
ansible.builtin.tempfile:
1313
state: directory
1414
suffix: gitlab-runner-config
1515
register: temp_runner_config_dir
1616
check_mode: false
1717
changed_when: false
1818

19-
- name: Write config section for each runner
19+
- name: "Write config section for each runner"
2020
vars:
2121
conf_name_prefix: "conf[{{ (runner_config_index | int) + 1 }}/{{ runner_configs | length }}]:"
2222
ansible.builtin.include_tasks: config-runner-container.yml
@@ -25,7 +25,7 @@
2525
index_var: runner_config_index
2626
loop_var: runner_config
2727

28-
- name: Assemble new config.toml
28+
- name: "Assemble new config.toml"
2929
ansible.builtin.assemble:
3030
src: "{{ temp_runner_config_dir.path }}"
3131
dest: "{{ gitlab_runner_config_file }}"
@@ -37,7 +37,7 @@
3737
verify -c /gitlab-runner.conf
3838
mode: "0600"
3939

40-
- name: Remove temporary directory
40+
- name: "Remove temporary directory"
4141
ansible.builtin.file:
4242
path: "{{ temp_runner_config_dir.path }}"
4343
state: "absent"

tasks/config-runners-windows.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
---
2-
- name: (Windows) Get existing config.toml
2+
- name: "(Windows) Get existing config.toml"
33
ansible.builtin.slurp:
44
src: "{{ gitlab_runner_config_file }}"
55
register: runner_config_file
66

7-
- name: (Windows) Get pre-existing global config
7+
- name: "(Windows) Get pre-existing global config"
88
ansible.builtin.set_fact:
99
runner_global_config: "{{ (runner_config_file['content'] | b64decode).split('[[runners]]')[0] }}"
1010

11-
- name: (Windows) Get pre-existing runner configs
11+
- name: "(Windows) Get pre-existing runner configs"
1212
ansible.builtin.set_fact:
1313
runner_configs: "{{ (runner_config_file['content'] | b64decode).split('[[runners]]')[1:] }}"
1414

15-
- name: (Windows) Create temporary directory
15+
- name: "(Windows) Create temporary directory"
1616
ansible.windows.win_tempfile:
1717
state: directory
1818
suffix: gitlab-runner-config
1919
register: temp_runner_config_dir
2020
check_mode: false
2121
changed_when: false
2222

23-
- name: (Windows) Write config section for each runner
23+
- name: "(Windows) Write config section for each runner"
2424
vars:
2525
conf_name_prefix: "conf[{{ (runner_config_index | int) + 1 }}/{{ runner_configs | length }}]:"
2626
ansible.builtin.include_tasks: config-runner-windows.yml
@@ -29,35 +29,35 @@
2929
index_var: runner_config_index
3030
loop_var: runner_config
3131

32-
- name: (Windows) Assemble new config.toml
32+
- name: "(Windows) Assemble new config.toml"
3333
when: not ansible_check_mode
3434
block:
35-
- name: (Windows) Create temporary file config.toml
35+
- name: "(Windows) Create temporary file config.toml"
3636
ansible.windows.win_tempfile:
3737
state: file
3838
suffix: temp
3939
register: config_toml_temp
4040

41-
- name: (Windows) Write global config to file
41+
- name: "(Windows) Write global config to file"
4242
community.windows.win_lineinfile:
4343
insertbefore: BOF
4444
path: "{{ config_toml_temp.path }}"
4545
line: "{{ runner_global_config }}"
4646

47-
- name: (Windows) Create temporary file runners-config.toml
47+
- name: "(Windows) Create temporary file runners-config.toml"
4848
ansible.windows.win_tempfile:
4949
state: file
5050
suffix: temp
5151
register: runners_config_toml_temp
5252

53-
- name: (Windows) Assemble runners files in config dir
53+
- name: "(Windows) Assemble runners files in config dir"
5454
ansible.windows.win_shell: dir -rec | gc | out-file "{{ runners_config_toml_temp.path }}"
5555
args:
5656
chdir: "{{ temp_runner_config_dir.path }}"
5757

58-
- name: (Windows) Assemble new config.toml
58+
- name: "(Windows) Assemble new config.toml"
5959
ansible.windows.win_shell: gc "{{ config_toml_temp.path }}","{{ runners_config_toml_temp.path }}" | Set-Content "{{ gitlab_runner_config_file }}"
60-
- name: (Windows) Verify config
60+
- name: "(Windows) Verify config"
6161
ansible.windows.win_command: "{{ gitlab_runner_executable }} verify"
6262
args:
6363
chdir: "{{ gitlab_runner_config_file_location }}"

tasks/config-runners.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
---
2-
- name: Get existing config.toml
2+
- name: "Get existing config.toml"
33
ansible.builtin.slurp:
44
src: "{{ gitlab_runner_config_file }}"
55
register: runner_config_file
66
become: "{{ gitlab_runner_system_mode }}"
77

8-
- name: Get pre-existing runner configs
8+
- name: "Get pre-existing runner configs"
99
ansible.builtin.set_fact:
1010
runner_configs: "{{ (runner_config_file['content'] | b64decode).split('[[runners]]\n') }}"
1111
no_log: "{{ gitlab_runner_no_log_secrets | default(omit) }}"
1212

13-
- name: Create temporary directory
13+
- name: "Create temporary directory"
1414
ansible.builtin.tempfile:
1515
state: directory
1616
suffix: gitlab-runner-config
1717
register: temp_runner_config_dir
1818
check_mode: false
1919
changed_when: false
2020

21-
- name: Write config section for each runner
21+
- name: "Write config section for each runner"
2222
vars:
2323
conf_name_prefix: "conf[{{ (runner_config_index | int) + 1 }}/{{ runner_configs | length }}]:"
2424
ansible.builtin.include_tasks: config-runner.yml
@@ -28,7 +28,7 @@
2828
loop_var: runner_config
2929
no_log: "{{ gitlab_runner_no_log_secrets | default(omit) }}"
3030

31-
- name: Assemble new config.toml
31+
- name: "Assemble new config.toml"
3232
ansible.builtin.assemble:
3333
src: "{{ temp_runner_config_dir.path }}"
3434
dest: "{{ gitlab_runner_config_file }}"

tasks/global-setup-windows.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
2-
- name: (Windows) Create .gitlab-runner dir
2+
- name: "(Windows) Create .gitlab-runner dir"
33
ansible.windows.win_file:
44
path: "{{ gitlab_runner_config_file_location }}"
55
state: directory
66

7-
- name: (Windows) Ensure config.toml exists
7+
- name: "(Windows) Ensure config.toml exists"
88
ansible.windows.win_file:
99
path: "{{ gitlab_runner_config_file }}"
1010
state: touch
1111
modification_time: preserve
1212
access_time: preserve
1313

14-
- name: (Windows) Set concurrent option
14+
- name: "(Windows) Set concurrent option"
1515
community.windows.win_lineinfile:
1616
dest: "{{ gitlab_runner_config_file }}"
1717
regexp: ^(\s*)concurrent =.*
@@ -23,7 +23,7 @@
2323
- restart_gitlab_runner_macos
2424
- restart_gitlab_runner_windows
2525

26-
- name: (Windows) Set check_interval option
26+
- name: "(Windows) Set check_interval option"
2727
community.windows.win_lineinfile:
2828
dest: "{{ gitlab_runner_config_file }}"
2929
regexp: ^check_interval =.*
@@ -35,32 +35,32 @@
3535
- restart_gitlab_runner
3636
- restart_gitlab_runner_windows
3737

38-
- name: (Windows) Add listen_address to config
38+
- name: "(Windows) Add listen_address to config"
3939
community.windows.win_lineinfile:
4040
dest: "{{ gitlab_runner_config_file }}"
4141
regexp: ^listen_address =.*
4242
line: listen_address = "{{ gitlab_runner_listen_address }}"
4343
insertafter: \s*concurrent.*
4444
state: present
45-
when: gitlab_runner_listen_address | length > 0 # Ensure value is set
45+
when: gitlab_runner_listen_address | length > 0 # Ensure value is set
4646
notify:
4747
- restart_gitlab_runner
4848
- restart_gitlab_runner_windows
4949

50-
- name: (Windows) Add sentry dsn to config
50+
- name: "(Windows) Add sentry dsn to config"
5151
community.windows.win_lineinfile:
5252
dest: "{{ gitlab_runner_config_file }}"
5353
regexp: ^sentry_dsn =.*
5454
line: sentry_dsn = "{{ gitlab_runner_sentry_dsn }}"
5555
insertafter: \s*concurrent.*
5656
state: present
57-
when: gitlab_runner_sentry_dsn | length > 0 # Ensure value is set
57+
when: gitlab_runner_sentry_dsn | length > 0 # Ensure value is set
5858
notify:
5959
- restart_gitlab_runner
6060
- restart_gitlab_runner_macos
6161
- restart_gitlab_runner_windows
6262

63-
- name: (Windows) Add session server listen_address to config
63+
- name: "(Windows) Add session server listen_address to config"
6464
community.windows.win_lineinfile:
6565
dest: "{{ gitlab_runner_config_file }}"
6666
regexp: ^(\s+)listen_address =
@@ -72,7 +72,7 @@
7272
- restart_gitlab_runner_macos
7373
- restart_gitlab_runner_windows
7474

75-
- name: (Windows) Add session server advertise_address to config
75+
- name: "(Windows) Add session server advertise_address to config"
7676
community.windows.win_lineinfile:
7777
dest: "{{ gitlab_runner_config_file }}"
7878
regexp: ^\s*advertise_address =
@@ -84,7 +84,7 @@
8484
- restart_gitlab_runner_macos
8585
- restart_gitlab_runner_windows
8686

87-
- name: (Windows) Add session server session_timeout to config
87+
- name: "(Windows) Add session server session_timeout to config"
8888
community.windows.win_lineinfile:
8989
dest: "{{ gitlab_runner_config_file }}"
9090
regexp: ^\s*session_timeout =

0 commit comments

Comments
 (0)