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 7019c0c779f4d727bdd329bd7d91351ccf3b0336..52e39f3333666e5bb98f9a53f28fde2b00d265c7 100644 (file)
--- 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
 }