From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 17 Jul 2020 16:50:31 +0000 (+0100)
Subject: cri-args-hostlists: Break out report_flight and publish_logs
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8ed0b036c3bdba0489aa19b9667649b6e57ea9c0;p=osstest.git

cri-args-hostlists: Break out report_flight and publish_logs

NFC.

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

diff --git a/cri-args-hostlists b/cri-args-hostlists
index 7019c0c..52e39f3 100644
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -128,10 +128,7 @@ start_email () {
 
 	date >&2
 
-	./sg-report-flight --report-processing-start-time \
-	        --html-dir=$flight_html_dir/$flight/ \
-		--allow=allow.all --allow=allow.$branch \
-		$sgr_args $flight >tmp/$flight.report
+	report_flight $flight
 	./cr-fold-long-lines tmp/$flight.report
 
 	date >&2
@@ -144,11 +141,23 @@ start_email () {
 	date >&2
 }
 
+report_flight () {
+	local flight=$1
+	./sg-report-flight --html-dir=$flight_html_dir/$flight/ \
+		--allow=allow.all --allow=allow.$branch \
+		$sgr_args $flight >tmp/$flight.report
+}
+
+publish_logs () {
+	local flight=$1
+	./cr-publish-flight-logs ${OSSTEST_PUSH_HARNESS- --push-harness} \
+	    $flight >&2
+}
+
 publish_send_email () {
 	local flight=$1
+	publish_logs $flight
 	exec >&2
-	./cr-publish-flight-logs ${OSSTEST_PUSH_HARNESS- --push-harness} \
-	    $flight
 	send_email tmp/$flight.email
 }