Merge pull request #339 from nicoklaus/feature-overwriting-installati…

…on-directory Feature: Allow overwriting of 'gitlab_runner_install_directory'
riemers · Dec 4, 2024 · 9b2d82d · 9b2d82d
2 parents 7bc0aa0 + 5f33c5c
commit 9b2d82d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -11,6 +11,10 @@ gitlab_runner_wanted_version: latest
 # This variable should not be modified usually as it depends on the gitlab_runner_wanted_version variable
 gitlab_runner_wanted_tag: "{{ 'latest' if gitlab_runner_wanted_version == 'latest' else ('v' + gitlab_runner_wanted_version) }}"
 
+# Override the install directory under Windows via host variables etc. (Default: c:/gitlab-runner)
+gitlab_runner_custom_install_directory: ""
+gitlab_runner_install_directory: "{{ gitlab_runner_default_install_directory if (gitlab_runner_custom_install_directory == '') else gitlab_runner_custom_install_directory }}"
+
 # Overridden based on platform
 gitlab_runner_config_file: "{{ __gitlab_runner_config_file_system_mode if gitlab_runner_system_mode else __gitlab_runner_config_file_user_mode }}"
 gitlab_runner_config_file_location: "{{ gitlab_runner_config_file | dirname }}"

diff --git a/vars/Windows.yml b/vars/Windows.yml
@@ -5,7 +5,8 @@ gitlab_runner_download_url: https://gitlab-runner-downloads.s3.amazonaws.com/{{
 # working directory for gitlab runner. defaults to config file directory
 gitlab_runner_working_directory: ""
 
-gitlab_runner_install_directory: c:/gitlab-runner/
+gitlab_runner_default_install_directory: c:/gitlab-runner/
+
 gitlab_runner_config_file_location: "{{ gitlab_runner_install_directory }}"
 gitlab_runner_config_file: "{{ gitlab_runner_config_file_location }}/config.toml"  # on Windows