From 84dcf04f56e17c43a75272a10f99a6642e0e5196 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Mon, 18 May 2020 03:23:17 +0200 Subject: [PATCH 1/2] let buildbot use import role --- tasks/master.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/master.yaml b/tasks/master.yaml index c42a962..5699b7c 100644 --- a/tasks/master.yaml +++ b/tasks/master.yaml @@ -74,7 +74,7 @@ state: started name: buildbot@master.service -- include_role: +- import_role: name: certificate vars: certificate_name: buildbot @@ -86,7 +86,7 @@ - serverAuth certificate_common_name: "{{ buildbot_server_name }}" -- include_role: +- import_role: name: nginx vars: nginx_vhosts: "{{ buildbot_nginx_vhosts }}" From 6183afbed20d8869eef2cf2f263f5b394037d215 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Wed, 1 Jul 2020 07:13:56 +0200 Subject: [PATCH 2/2] project change filter --- templates/buildbot/master.cfg.j2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/buildbot/master.cfg.j2 b/templates/buildbot/master.cfg.j2 index a21c6d4..4803b61 100644 --- a/templates/buildbot/master.cfg.j2 +++ b/templates/buildbot/master.cfg.j2 @@ -138,7 +138,10 @@ for builders_config_file_path in builders_config_file_paths: c['schedulers'].append(schedulers.SingleBranchScheduler( 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, builderNames=[builder_name], ))