diff --git a/roles/taskotron/taskotron-trigger/defaults/main.yml b/roles/taskotron/taskotron-trigger/defaults/main.yml index 0123d96597..bda15eac2f 100644 --- a/roles/taskotron/taskotron-trigger/defaults/main.yml +++ b/roles/taskotron/taskotron-trigger/defaults/main.yml @@ -3,4 +3,5 @@ trigger_joblog_file: /var/log/taskotron-trigger/jobs.csv trigger_critpath_file: /var/lib/taskotron-trigger/critpath_whitelist trigger_critpath_url: https://admin.fedoraproject.org/pkgdb/api/critpath?format=json trigger_cache_dir: /var/lib/taskotron-trigger/cache +trigger_rules_template_path: /etc/taskotron/trigger_rules.yml extra_enablerepos: '' diff --git a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 index e4dd9843f0..8fa63e28ad 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 @@ -1,3 +1,4 @@ +{% if deployment_type in ['stg', 'prod'] %} [buildbot] url = http://127.0.0.1:8080/change_hook @@ -16,7 +17,7 @@ joblog_file = {{ trigger_joblog_file }} fuse_delay = 900 ; 15 minutes in seconds [distgit] -{% if deployment_type in ['dev', 'stg'] %} +{% if deployment_type in ['stg'] %} enabled = True {% else %} enabled = False @@ -28,3 +29,22 @@ namespace = rpms-checks [abicheck] critpath_filepath = {{ trigger_critpath_file }} critpath_exclude = firefox,thunderbird,kernel,kdelibs,kdepim,qt +{% elif deployment_type in ['dev'] %} +[buildbot] +url = http://127.0.0.1:8080/change_hook + +[trigger] +valid_arches = x86_64 +koji_url = http://koji.fedoraproject.org/kojihub +datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw +execdb_server = {{ execdb_server }} +runner_type = BuildbotRunner +job_logging = True +joblog_file = {{ trigger_joblog_file }} +fuse_delay = 900 ; 15 minutes in seconds +git_cache_dir = {{ trigger_cache_dir }} +rules_template = {{ trigger_rules_template_path }} + +[koji_build_completed] +critpath_filepath = {{ trigger_crithpath_file }} +{% endif %}