diff --git a/inventory/group_vars/koschei b/inventory/group_vars/koschei index e62470c9ba..b09afc6e9d 100644 --- a/inventory/group_vars/koschei +++ b/inventory/group_vars/koschei @@ -7,12 +7,14 @@ num_cpus: 4 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file +koschei_topurl: https://apps.fedoraproject.org/koschei koschei_pgsql_hostname: FIXME koschei_koji_hub: koji02.phx2.fedoraproject.org koschei_kojipkgs: kojipkgs01.phx2.fedoraproject.org koschei_koji_web: koji.fedoraproject.org koschei_koji_tag: f23 koschei_openid_provider: id.fedoraproject.org +koschei_bugzilla: bugzilla.redhat.com tcp_ports: [ 80, 443, diff --git a/inventory/group_vars/koschei-stg b/inventory/group_vars/koschei-stg index 2f6a14f9f8..a6e0e193c0 100644 --- a/inventory/group_vars/koschei-stg +++ b/inventory/group_vars/koschei-stg @@ -7,12 +7,15 @@ num_cpus: 2 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file +koschei_topurl: https://apps.stg.fedoraproject.org/koschei koschei_pgsql_hostname: db01.stg.phx2.fedoraproject.org koschei_koji_hub: koji01.stg.phx2.fedoraproject.org koschei_kojipkgs: koji01.stg.phx2.fedoraproject.org koschei_koji_web: koji.stg.fedoraproject.org koschei_koji_tag: f23 koschei_openid_provider: id.stg.fedoraproject.org +koschei_bugzilla: partner-bugzilla.redhat.com + tcp_ports: [ 80, 443, # These 9 are for fedmsg right now, but we need to check with the koschei diff --git a/playbooks/hosts/koschei.cloud.fedoraproject.org.yml b/playbooks/hosts/koschei.cloud.fedoraproject.org.yml index ed9b2934a2..c66ceea4df 100644 --- a/playbooks/hosts/koschei.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/koschei.cloud.fedoraproject.org.yml @@ -23,6 +23,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml vars: + - koschei_topurl: http://koschei.cloud.fedoraproject.org - koschei_pgsql_hostname: localhost - koscheiuser_db_password: "{{ koschei_pgsql_password }}" - koscheiadmin_db_password: "{{ koschei_pgsql_password }}" @@ -31,6 +32,7 @@ - koschei_koji_web: koji.fedoraproject.org - koschei_koji_tag: f23 - koschei_openid_provider: id.fedoraproject.org + - koschei_bugzilla: bugzilla.redhat.com roles: - koschei diff --git a/roles/koschei/templates/config.cfg.j2 b/roles/koschei/templates/config.cfg.j2 index ae54852451..4a570d1a32 100644 --- a/roles/koschei/templates/config.cfg.j2 +++ b/roles/koschei/templates/config.cfg.j2 @@ -111,6 +111,29 @@ config = { "openid": { "openid_provider": "{{ koschei_openid_provider }}", }, + "bugreport": { + "url": "https://{{ koschei_bugzilla }}/enter_bug.cgi?%s", + "template": { + "product": "Fedora", + "component": "{name}", + "version": "rawhide", + "short_desc": "{name}: FTBFS in rawhide", + "bug_file_loc": "{{ koschei_topurl }}/package/{name}", + "comment": """ + Description of problem: + Package {name} fails to build from source in rawhide. + + Version-Release number of selected component (if applicable): + {version}-{release} + + Steps to Reproduce: + koji build --scratch {{ koschei_koji_tag }} {nvr}.{arch}.rpm + + Additional info: + This package is tracked by Koschei. See: + {{ koschei_topurl }}/package/{name}""" + }, + }, } # Local Variables: