infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

check-compose: update template to fix Atomic compose mails

Browse source 
The special configuration for check-compose mails for two-week
Atomic nightly composes was broken due to fedfind changes. We
need to tweak this template a bit as part of fixing it up.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-04-25 14:10:11 -07:00
parent 8b776bcf1c
commit c01bdeee92
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/group_vars/openqa
View file

@ -30,8 +30,8 @@ wikitcms_token: "{{ private }}/files/openidc/production/wikitcms.json"
# if additional systems were added to this group. # if additional systems were added to this group.
checkcompose_emailfrom: rawhide@fedoraproject.org checkcompose_emailfrom: rawhide@fedoraproject.org
checkcompose_emailto: "test@lists.fedoraproject.org devel@lists.fedoraproject.org" checkcompose_emailto: "test@lists.fedoraproject.org devel@lists.fedoraproject.org"
checkcompose_postrelease_emailto: "mmcgrath@fedoraproject.org atomic@lists.fedoraproject.org" checkcompose_atomic_emailto: "dusty@dustymabe.com walters@verbum.org atomic@lists.fedoraproject.org"
checkcompose_postrelease_emailerror: "true" checkcompose_atomic_emailerror: "true"
checkcompose_smtp: bastion.phx2.fedoraproject.org checkcompose_smtp: bastion.phx2.fedoraproject.org
checkcompose_url: "https://{{ external_hostname }}" checkcompose_url: "https://{{ external_hostname }}"

6
roles/check-compose/tasks/main.yml
View file

@ -15,6 +15,12 @@
## string - Email address to send report to (if not set but email-from ## string - Email address to send report to (if not set but email-from
## set, report will go to email-from, for testing usually) ## set, report will go to email-from, for testing usually)
## Split multiple addresses with spaces ## 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 # - checkcompose_smtp
## string - SMTP server to use for sending the report ## string - SMTP server to use for sending the report
# - checkcompose_json # - checkcompose_json

17
roles/check-compose/templates/check-compose.conf.j2
View file

@ -23,17 +23,10 @@ json: {{ checkcompose_json }}
{% if checkcompose_loglevel is defined %} {% if checkcompose_loglevel is defined %}
loglevel: {{ checkcompose_loglevel }} loglevel: {{ checkcompose_loglevel }}
{% endif %} {% endif %}
[Postrelease] [Fedora-Atomic]
{% if checkcompose_postrelease_emailto is defined %} {% if checkcompose_atomic_emailto is defined %}
email-to: {{ checkcompose_postrelease_emailto }} email-to: {{ checkcompose_atomic_emailto }}
{% endif %} {% endif %}
{% if checkcompose_postrelease_emailerror is defined %} {% if checkcompose_atomic_emailerror is defined %}
email-error: {{ checkcompose_postrelease_emailerror }} email-error: {{ checkcompose_atomic_emailerror }}
{% endif %}
[Atomic]
{% if checkcompose_postrelease_emailto is defined %}
email-to: {{ checkcompose_postrelease_emailto }}
{% endif %}
{% if checkcompose_postrelease_emailerror is defined %}
email-error: {{ checkcompose_postrelease_emailerror }}
{% endif %} {% endif %}