From c3437362c1f0065b31dff6a3639518675487e4a9 Mon Sep 17 00:00:00 2001 From: Steffen Dirkwinkel Date: Wed, 10 Apr 2024 12:35:41 +0200 Subject: [PATCH] vars: unify and move gitlab_runner_timeout_stop_seconds to defaults There's not really a reason to have different values for each os. This unifies the default to be 7200 and allows overriding it (because it's now just a default var). I use the override for hosts with long running ci jobs. Signed-off-by: Steffen Dirkwinkel --- defaults/main.yml | 3 +++ vars/Archlinux.yml | 1 - vars/Debian.yml | 1 - vars/RedHat.yml | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 306b4ca..6eac373 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -82,6 +82,9 @@ gitlab_runner_container_network: default # default state to restart gitlab_runner_restart_state: restarted +# systemd service kill timeout (time to wait for running jobs on stop) +gitlab_runner_timeout_stop_seconds: 7200 + # default value for log_format # gitlab_runner_log_format: runner diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml index e20f8c2..1220970 100644 --- a/vars/Archlinux.yml +++ b/vars/Archlinux.yml @@ -5,4 +5,3 @@ gitlab_runner_executable: /usr/bin/{{ gitlab_runner_package_name }} gitlab_runner_runtime_owner: gitlab-runner gitlab_runner_runtime_group: gitlab-runner gitlab_runner_restart_state: reloaded -gitlab_runner_timeout_stop_seconds: 720 diff --git a/vars/Debian.yml b/vars/Debian.yml index e20f8c2..1220970 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -5,4 +5,3 @@ gitlab_runner_executable: /usr/bin/{{ gitlab_runner_package_name }} gitlab_runner_runtime_owner: gitlab-runner gitlab_runner_runtime_group: gitlab-runner gitlab_runner_restart_state: reloaded -gitlab_runner_timeout_stop_seconds: 720 diff --git a/vars/RedHat.yml b/vars/RedHat.yml index e2004c4..38de971 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -4,4 +4,3 @@ gitlab_runner_executable: /usr/bin/{{ gitlab_runner_package_name }} gitlab_runner_runtime_owner: gitlab-runner gitlab_runner_runtime_group: gitlab-runner -gitlab_runner_timeout_stop_seconds: 7200