opensourcemirror
/
fedora-ansible
mirror of https://pagure.io/fedora-infra/ansible.git
1
0
Fork 0
Code Issues Releases Wiki Activity

check-compose: try to rejig email recipients for new system 

I changed how check-compose upstream does email recipient config
to try and fix the 'get Atomic-related emails to Atomic people'
problem again after Fedora-Atomic composes went away. This is
an attempt to adjust the play to populate the config file for
that change. Let's see what blows up!

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-06-24 19:02:30 -07:00
parent 6705ee4d37
commit 455af49b80
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inventory/group_vars/checkcompose
View File

@ -8,8 +8,9 @@ checkcompose_env: production
# if additional systems were added to this group.
checkcompose_emailfrom: rawhide@fedoraproject.org
checkcompose_emailto: "test@lists.fedoraproject.org devel@lists.fedoraproject.org"
checkcompose_atomic_emailto: "dusty@dustymabe.com walters@verbum.org atomic@lists.fedoraproject.org"
checkcompose_atomic_emailerror: "true"
checkcompose_subvariant_emails:
AtomicHost:
error: "dusty@dustymabe.com walters@verbum.org atomic@lists.fedoraproject.org"
checkcompose_smtp: bastion.phx2.fedoraproject.org
checkcompose_url: "https://{{ external_hostname }}"
checkcompose_greenwaveurl: https://greenwave-web-greenwave.app.os.fedoraproject.org

26
roles/check-compose/tasks/main.yml
View File

@ -65,17 +65,25 @@
## string - (digits) time in minutes to wait for openQA tests to complete
## before sending the report (defaults to 480)
# - checkcompose_emailfrom
## string - Email address to send report from (if not set, no report sent)
## string - Email address to send reports from (if not set, no reports
## sent)
# - checkcompose_emailto
## string - Email address to send report to (if not set but email-from
## set, report will go to email-from, for testing usually)
## string - Email address to send all reports to. Split multiple
## addresses with spaces
# - checkcompose_subvariant_emails
## dict - Per-subvariant recipients foe check-compose emails. Should
## be a dict of dicts like this:
## {
## 'Workstation': {
## 'all': ['foo@workstation.com', 'bar@workstation.com'],
## 'error': ['error@workstation.com'],
## },
## 'Server': {
## 'all': ['foo@server.com'],
## 'error': ['error@server.com'],
## },
## }
## Split multiple addresses with spaces
# - checkcompose_atomic_emailto
## string - Email address to send report for Fedora-Atomic composes to
## Split multiple addresses with spaces
# - checkcompose_atomic_emailerror
## string - Set to 'true' if reports for Fedora-Atomic composes should
## only be mailed out if any tests did not pass
# - checkcompose_smtp
## string - SMTP server to use for sending the report
# - checkcompose_json

11
roles/check-compose/templates/check-compose.conf.j2
View File

@ -26,10 +26,7 @@ json: {{ checkcompose_json }}
{% if checkcompose_loglevel is defined %}
loglevel: {{ checkcompose_loglevel }}
{% endif %}
[Fedora-Atomic]
{% if checkcompose_atomic_emailto is defined %}
email-to: {{ checkcompose_atomic_emailto }}
{% endif %}
{% if checkcompose_atomic_emailerror is defined %}
email-error: {{ checkcompose_atomic_emailerror }}
{% endif %}
{% for subv, recdict in checkcompose_subvariant_emails.items() %}
[{{ subv }}]
{% for rectype, recips in recdict %}
{{ rectype }}: {{ recips|join(' ') }}