Re: [OSSTEST PATCH 3/8] emails: honour OSSTEST_EMAIL_SUBJECT_PREFIX

[Ian Campbell <ian.campbell@citrix.com>]

On Wed, 2015-02-25 at 13:01 +0000, Ian Jackson wrote:
> 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.

Do they not already get "adhoc" in the $subject? i.e. my commissioning
runs for the new arm create (following README.dev procedure) resulted in
mails with:

[adhoc test] 34418: trouble: blocked/broken/fail/pass

(IOW it seems $branch is replaced by adhoc somewhere along the say)

> 
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> ---
>  cri-args-hostlists |    2 +-
>  cri-bisect         |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/cri-args-hostlists b/cri-args-hostlists
> index 3e5ef44..ef4cebd 100644
> --- 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 e7ed24b..2cfb49a 100644
> --- 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