Skip to content

Allow None value maximum_timeout for gitlab_runner #11174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 25, 2025
+8 −2
Merged

Allow None value maximum_timeout for gitlab_runner #11174

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
85db976
change maximum_timeout type to raw
Nov 18, 2025
f72d530
allow None value for maximum_timeout in update_runner
Nov 18, 2025
8903bdb
add changelog
Nov 18, 2025
7d46fad
update changelog fragment formatting
Nov 18, 2025
55970b1
convert maximum_timeout value of 0 to None
Nov 19, 2025
592db54
fix sanity check errors
Nov 19, 2025
3842e8b
add suggested doc changes
Nov 21, 2025
c455215
Note version required for timeout disable
Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/11174-gitlab-runner-timeout.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- gitlab_runner - Convert ``maximum_timeout`` to ``None`` when set to 0 (https://github.com/ansible-collections/community.general/pull/11174).
9 changes: 6 additions & 3 deletions plugins/modules/gitlab_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
version_added: 6.3.0
maximum_timeout:
description:
- The maximum time that a runner has to complete a specific job.
- The maximum time that a runner has to complete a specific job. Use 0 to set to None.
default: 3600
type: int
run_untagged:
Expand Down Expand Up @@ -365,7 +365,7 @@ def update_runner(self, runner, arguments):
changed = False

for arg_key, arg_value in arguments.items():
if arg_value is not None:
if arg_value is not None or arg_key == "maximum_timeout":
Copy link
Collaborator

@russoz russoz Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After changing the disable value to 0, I think the change in this line has become redundant, but I have not checked it thoroughly.

Copy link
Contributor Author

@colin93 colin93 Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the value of maximum_timeout is already converted to None at this stage without this check a value of 0 would end up being skipped for updates.

if isinstance(arg_value, list):
list1 = getattr(runner, arg_key)
list1.sort()
Expand Down Expand Up @@ -475,7 +475,10 @@ def main():
run_untagged = module.params["run_untagged"]
runner_locked = module.params["locked"]
access_level = module.params["access_level"]
maximum_timeout = module.params["maximum_timeout"]
if module.params["maximum_timeout"] == 0:
maximum_timeout = None
else:
maximum_timeout = module.params["maximum_timeout"]
registration_token = module.params["registration_token"]
project = module.params["project"]
group = module.params["group"]
Expand Down