From c01bdeee92f7c0f4a788d5c661fb262604818f01 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 25 Apr 2018 14:10:11 -0700 Subject: [PATCH] check-compose: update template to fix Atomic compose mails 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 --- inventory/group_vars/openqa | 4 ++-- roles/check-compose/tasks/main.yml | 6 ++++++ .../templates/check-compose.conf.j2 | 17 +++++------------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa index dacef49975..7654a57186 100644 --- a/inventory/group_vars/openqa +++ b/inventory/group_vars/openqa @@ -30,8 +30,8 @@ wikitcms_token: "{{ private }}/files/openidc/production/wikitcms.json" # if additional systems were added to this group. checkcompose_emailfrom: rawhide@fedoraproject.org checkcompose_emailto: "test@lists.fedoraproject.org devel@lists.fedoraproject.org" -checkcompose_postrelease_emailto: "mmcgrath@fedoraproject.org atomic@lists.fedoraproject.org" -checkcompose_postrelease_emailerror: "true" +checkcompose_atomic_emailto: "dusty@dustymabe.com walters@verbum.org atomic@lists.fedoraproject.org" +checkcompose_atomic_emailerror: "true" checkcompose_smtp: bastion.phx2.fedoraproject.org checkcompose_url: "https://{{ external_hostname }}" diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml index 4189a71539..873ea87802 100644 --- a/roles/check-compose/tasks/main.yml +++ b/roles/check-compose/tasks/main.yml @@ -15,6 +15,12 @@ ## string - Email address to send report to (if not set but email-from ## set, report will go to email-from, for testing usually) ## 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 diff --git a/roles/check-compose/templates/check-compose.conf.j2 b/roles/check-compose/templates/check-compose.conf.j2 index 5a6fc26dbc..fceb4a44ce 100644 --- a/roles/check-compose/templates/check-compose.conf.j2 +++ b/roles/check-compose/templates/check-compose.conf.j2 @@ -23,17 +23,10 @@ json: {{ checkcompose_json }} {% if checkcompose_loglevel is defined %} loglevel: {{ checkcompose_loglevel }} {% endif %} -[Postrelease] -{% if checkcompose_postrelease_emailto is defined %} -email-to: {{ checkcompose_postrelease_emailto }} +[Fedora-Atomic] +{% if checkcompose_atomic_emailto is defined %} +email-to: {{ checkcompose_atomic_emailto }} {% endif %} -{% if checkcompose_postrelease_emailerror is defined %} -email-error: {{ checkcompose_postrelease_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 }} +{% if checkcompose_atomic_emailerror is defined %} +email-error: {{ checkcompose_atomic_emailerror }} {% endif %}