2 changed files with 6 additions and 3 deletions
Unified View
Diff Options
-
+2 -2tasks/master.yaml
-
+4 -1templates/buildbot/master.cfg.j2
+ 2
- 2
tasks/master.yaml
View File
| @@ -74,7 +74,7 @@ | |||||
| state: started | state: started | ||||
| name: buildbot@master.service | name: buildbot@master.service | ||||
| - include_role: | |||||
| - import_role: | |||||
| name: certificate | name: certificate | ||||
| vars: | vars: | ||||
| certificate_name: buildbot | certificate_name: buildbot | ||||
| @@ -86,7 +86,7 @@ | |||||
| - serverAuth | - serverAuth | ||||
| certificate_common_name: "{{ buildbot_server_name }}" | certificate_common_name: "{{ buildbot_server_name }}" | ||||
| - include_role: | |||||
| - import_role: | |||||
| name: nginx | name: nginx | ||||
| vars: | vars: | ||||
| nginx_vhosts: "{{ buildbot_nginx_vhosts }}" | nginx_vhosts: "{{ buildbot_nginx_vhosts }}" | ||||
+ 4
- 1
templates/buildbot/master.cfg.j2
View File
| @@ -146,7 +146,10 @@ for builders_config_file_path in builders_config_file_paths: | |||||
| c['schedulers'].append(schedulers.SingleBranchScheduler( | c['schedulers'].append(schedulers.SingleBranchScheduler( | ||||
| name=builder_name, | name=builder_name, | ||||
| change_filter=util.ChangeFilter(branch=builder_config['repo']['branch']), | |||||
| change_filter=util.ChangeFilter( | |||||
| branch=builder_config['repo']['branch'], | |||||
| project=builder_config['repo']['project'], | |||||
| ), | |||||
| treeStableTimer=5, | treeStableTimer=5, | ||||
| builderNames=[builder_name], | builderNames=[builder_name], | ||||
| )) | )) | ||||