ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-05 10:10:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 6a020dc328 into 70b5e362f9

Browse source
This commit is contained in:
David Phillips 2025-04-02 20:25:30 +00:00 • committed by GitHub
commit e1f9dd0640
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/9960-gitlab_project-add-build_timeout-option.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- gitlab_project - add option ``build_timeout`` (https://github.com/ansible-collections/community.general/pull/9960).

9
plugins/modules/gitlab_project.py
View file

@ -44,6 +44,11 @@ options:
- This option is only used on creation, not for updates. - This option is only used on creation, not for updates.
type: path type: path
version_added: "4.2.0" version_added: "4.2.0"
build_timeout:
description:
- Maximum number of seconds a CI job can run.
type: int
version_added: "10.6.0"
builds_access_level: builds_access_level:
description: description:
- V(private) means that repository CI/CD is allowed only to project members. - V(private) means that repository CI/CD is allowed only to project members.
@ -430,6 +435,7 @@ class GitLabProject(object):
project_options = { project_options = {
'allow_merge_on_skipped_pipeline': options['allow_merge_on_skipped_pipeline'], 'allow_merge_on_skipped_pipeline': options['allow_merge_on_skipped_pipeline'],
'builds_access_level': options['builds_access_level'], 'builds_access_level': options['builds_access_level'],
'build_timeout': options['build_timeout'],
'ci_config_path': options['ci_config_path'], 'ci_config_path': options['ci_config_path'],
'container_expiration_policy': options['container_expiration_policy'], 'container_expiration_policy': options['container_expiration_policy'],
'container_registry_access_level': options['container_registry_access_level'], 'container_registry_access_level': options['container_registry_access_level'],
@ -591,6 +597,7 @@ def main():
allow_merge_on_skipped_pipeline=dict(type='bool'), allow_merge_on_skipped_pipeline=dict(type='bool'),
avatar_path=dict(type='path'), avatar_path=dict(type='path'),
builds_access_level=dict(type='str', choices=['private', 'disabled', 'enabled']), builds_access_level=dict(type='str', choices=['private', 'disabled', 'enabled']),
build_timeout=dict(type='int'),
ci_config_path=dict(type='str'), ci_config_path=dict(type='str'),
container_expiration_policy=dict(type='dict', default=None, options=dict( container_expiration_policy=dict(type='dict', default=None, options=dict(
cadence=dict(type='str', choices=["1d", "7d", "14d", "1month", "3month"]), cadence=dict(type='str', choices=["1d", "7d", "14d", "1month", "3month"]),
@ -664,6 +671,7 @@ def main():
allow_merge_on_skipped_pipeline = module.params['allow_merge_on_skipped_pipeline'] allow_merge_on_skipped_pipeline = module.params['allow_merge_on_skipped_pipeline']
avatar_path = module.params['avatar_path'] avatar_path = module.params['avatar_path']
builds_access_level = module.params['builds_access_level'] builds_access_level = module.params['builds_access_level']
build_timeout = module.params['build_timeout']
ci_config_path = module.params['ci_config_path'] ci_config_path = module.params['ci_config_path']
container_expiration_policy = module.params['container_expiration_policy'] container_expiration_policy = module.params['container_expiration_policy']
container_registry_access_level = module.params['container_registry_access_level'] container_registry_access_level = module.params['container_registry_access_level']
@ -748,6 +756,7 @@ def main():
"allow_merge_on_skipped_pipeline": allow_merge_on_skipped_pipeline, "allow_merge_on_skipped_pipeline": allow_merge_on_skipped_pipeline,
"avatar_path": avatar_path, "avatar_path": avatar_path,
"builds_access_level": builds_access_level, "builds_access_level": builds_access_level,
"build_timeout": build_timeout,
"ci_config_path": ci_config_path, "ci_config_path": ci_config_path,
"container_expiration_policy": container_expiration_policy, "container_expiration_policy": container_expiration_policy,
"container_registry_access_level": container_registry_access_level, "container_registry_access_level": container_registry_access_level,