Merge branch 'master' of git.thengo.net:ka/ansible-role-buildbot

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 }}"

templates/buildbot/master.cfg.j2

@@ -146,7 +146,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],
       ))