From 9faf3531cfa6d0704e0f70c5a65dee4b1350cec0 Mon Sep 17 00:00:00 2001 From: Nicolas Lehle Date: Tue, 30 Jul 2024 09:44:31 +0200 Subject: [PATCH 1/2] feat: move 'gitlab_runner_install_directory' into defaults to allow overwriting --- defaults/main.yml | 3 +++ vars/Windows.yml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 7182bcce..71d5df34 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,6 +11,9 @@ 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) }}" +# If a different partition or disk is used under Windows +gitlab_runner_install_directory: c:/gitlab-runner/ + # 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 index ad6b85fb..1174c29a 100644 --- a/vars/Windows.yml +++ b/vars/Windows.yml @@ -2,7 +2,6 @@ gitlab_runner_download_url: https://gitlab-runner-downloads.s3.amazonaws.com/{{ gitlab_runner_wanted_tag }}/binaries/gitlab-runner-windows-amd64.exe -gitlab_runner_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 From dd319a11ac357f0747aa8a700f160e85eae99fb5 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 4 Dec 2024 14:48:30 +0000 Subject: [PATCH 2/2] feat: use if condition to set install directory under windows --- defaults/main.yml | 5 +++-- vars/Windows.yml | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 71d5df34..a162ff86 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,8 +11,9 @@ 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) }}" -# If a different partition or disk is used under Windows -gitlab_runner_install_directory: c:/gitlab-runner/ +# 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 }}" diff --git a/vars/Windows.yml b/vars/Windows.yml index 1174c29a..6f58ee5e 100644 --- a/vars/Windows.yml +++ b/vars/Windows.yml @@ -2,6 +2,10 @@ gitlab_runner_download_url: https://gitlab-runner-downloads.s3.amazonaws.com/{{ gitlab_runner_wanted_tag }}/binaries/gitlab-runner-windows-amd64.exe +# working directory for gitlab runner. defaults to config file directory +gitlab_runner_working_directory: "" + +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