From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [OSSTEST PATCH 3/8] emails: honour
	OSSTEST_EMAIL_SUBJECT_PREFIX
Date: Wed, 25 Feb 2015 13:24:32 +0000
Message-ID: <1424870672.20243.98.camel@citrix.com>
References: <1424869277-16764-1-git-send-email-ian.jackson@eu.citrix.com>
	<1424869277-16764-4-git-send-email-ian.jackson@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta14.messagelabs.com ([193.109.254.103])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <Ian.Campbell@citrix.com>) id 1YQby1-0000e0-0R
	for xen-devel@lists.xenproject.org; Wed, 25 Feb 2015 13:25:33 +0000
In-Reply-To: <1424869277-16764-4-git-send-email-ian.jackson@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: xen-devel@lists.xenproject.org
List-Id: xen-devel@lists.xenproject.org

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