emails: honour OSSTEST_EMAIL_SUBJECT_PREFIX

This is prefixed before the other computed prefixes.  It makes it
easier to distinguish an adhoc cr-daily-branch test runs for a real
branch.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/cri-args-hostlists b/cri-args-hostlists
index 3e5ef44b565b48dd204ed81314807e3b89168927..ef4cebd563e93dd48efcb7382d8a11c62a228fc0 100644 (file)
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -105,7 +105,7 @@ start_email () {
                cat $OSSTEST_EMAIL_HEADER
        fi
        echo "Message-ID: <osstest-$flight-mainreport@xen.org>"
-       printf 'Subject: %s' "${subject_prefix:-[$branch test] }"
+       printf 'Subject: %s' "${OSSTEST_EMAIL_SUBJECT_PREFIX}${subject_prefix:-[$branch test] }"
 
        local flight_html_dir=$OSSTEST_HTMLPUB_DIR/
        local job_html_dir=$OSSTEST_HTML_DIR/

diff --git a/cri-bisect b/cri-bisect
index e7ed24b585fea08cd906723654e00d7f1d6ec16a..2cfb49ad8e0a79c38cb03838007362acd1df68c1 100644 (file)
--- a/cri-bisect
+++ b/cri-bisect
@@ -89,7 +89,7 @@ send_bisection_email () {
         exec 3>tmp/$flight.email
         cat >&3 $OSSTEST_EMAIL_HEADER$2
         cat >&3 <<END
-Subject: $subject_prefix $1 $job
+Subject: ${OSSTEST_EMAIL_SUBJECT_PREFIX}$subject_prefix $1 $job
 
 branch $xenbranch
 xen branch $xenbranch