[OSSTEST PATCH 1/2] cs-bisection-step: Remove a bit of duplication

[OSSTEST PATCH 1/2] cs-bisection-step: Remove a bit of duplication

[Ian Jackson]

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 cs-bisection-step |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cs-bisection-step b/cs-bisection-step
index 3172b57..d5f8cb8 100755
--- a/cs-bisection-step
+++ b/cs-bisection-step
@@ -441,7 +441,7 @@ sub digraph_whole () {
 	    if (defined $url && length $url) {
 		push @treeinfos, {
 		    Name => $tree,
-		    Url => $latest_rmap->{$tree}{Url}
+		    Url => $url,
 		};
 	    } else {
 		print STDERR "(tree with no url: $tree)\n";
-- 
1.7.10.4

[OSSTEST PATCH 2/2] cri-args-hostlists, etc.: Send rumpuserxen reports to rumpkernel-builds

[Ian Jackson]

There is now a list, rumpkernel-builds@lists.sourceforge, for this
kind of information relating to rumpuser-xen.

Provide a facility in cri-args-hostlists for start_email to look for
$OSSTEST_EMAIL_HEADER--$branch.

Introduce two new files
  daily-cron-email-real--rumpuserxen
  daily-cron-email-real-bisectcomplete--rumpuserxen
which override the general settings.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 cri-args-hostlists                                |    7 ++++++-
 daily-cron-email-real--rumpuserxen                |    3 +++
 daily-cron-email-real-bisectcomplete--rumpuserxen |    3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 daily-cron-email-real--rumpuserxen
 create mode 100644 daily-cron-email-real-bisectcomplete--rumpuserxen

diff --git a/cri-args-hostlists b/cri-args-hostlists
index 4f7ddf2..57958d3 100644
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -94,7 +94,12 @@ start_email () {
         # redirects stdout
 
 	exec >tmp/$flight.email
-	cat $OSSTEST_EMAIL_HEADER
+	branchemailheader=$OSSTEST_EMAIL_HEADER--$branch
+	if test -e $branchemailheader; then
+		cat $branchemailheader
+	else
+		cat $OSSTEST_EMAIL_HEADER
+	fi
 	echo "Message-ID: <osstest-$flight-mainreport@xen.org>"
 	printf 'Subject: %s' "${subject_prefix:-[$branch test] }"
 
diff --git a/daily-cron-email-real--rumpuserxen b/daily-cron-email-real--rumpuserxen
new file mode 100644
index 0000000..67c48bf
--- /dev/null
+++ b/daily-cron-email-real--rumpuserxen
@@ -0,0 +1,3 @@
+To: xen-devel@lists.xensource.com,
+    rumpkernel-builds@lists.sourceforge.net
+Cc: ian.jackson@eu.citrix.com
diff --git a/daily-cron-email-real-bisectcomplete--rumpuserxen b/daily-cron-email-real-bisectcomplete--rumpuserxen
new file mode 100644
index 0000000..67c48bf
--- /dev/null
+++ b/daily-cron-email-real-bisectcomplete--rumpuserxen
@@ -0,0 +1,3 @@
+To: xen-devel@lists.xensource.com,
+    rumpkernel-builds@lists.sourceforge.net
+Cc: ian.jackson@eu.citrix.com
-- 
1.7.10.4