Display all logs at toplevel (some users prefer that).cmp-jobs

Change-Id: Ia4e89ccbdfea49275285604a703a93416b9e75e0

2 files changed, 38 insertions, 3 deletions

diff --git a/scripts/CompareJobs.job b/scripts/CompareJobs.job
index f7f31ea7..39f5681f 100755
--- a/scripts/CompareJobs.job
+++ b/scripts/CompareJobs.job
@@ -25,6 +25,7 @@ BUILD_URL=${BUILD_URL:-}
 WORKSPACE=${WORKSPACE:-$PWD/workspace}
 LOGSDIR=${WORKSPACE}/artifacts/logs
 
+rm -rf ${LOGSDIR}
 mkdir -p ${LOGSDIR}
 
 # Expected input parameters (from Jenkins):
@@ -64,8 +65,8 @@ ssh ${fileserver} bash ${dest}/compare_jobs.sh \
 
 # Copy the generated reports
 scp ${fileserver}:${dest}/diff-*.txt ${LOGSDIR}
-scp ${fileserver}:${dest}/report.xml ${LOGSDIR}
-sed -i ${LOGSDIR}/report.xml -e "s|BUILD_URL|${BUILD_URL}|"
+scp ${fileserver}:${dest}/*.xml ${LOGSDIR}
+sed -i ${LOGSDIR}/report0.xml -e "s|BUILD_URL|${BUILD_URL}|"
 
 ssh ${fileserver} rm -rf ${dest}
 
diff --git a/scripts/compare_jobs.sh b/scripts/compare_jobs.sh
index 81c26323..b88a620c 100755
--- a/scripts/compare_jobs.sh
+++ b/scripts/compare_jobs.sh
@@ -58,6 +58,34 @@ function xml_report_print_footer
 EOF
 }
 
+function xml_log_print_field
+{
+    local target=${1?}
+    local log=${2?}
+    cat <<EOF
+  <field name="${target}">
+    <![CDATA[
+EOF
+cat $log
+cat <<EOF
+    ]]></field>
+EOF
+}
+
+function xml_log_print_header
+{
+    cat <<EOF
+<section name="Logs">
+EOF
+}
+
+function xml_log_print_footer
+{
+    cat <<EOF
+</section>
+EOF
+}
+
 # For the time being, we expect different jobs to store their results
 # in similar directories.
 
@@ -80,10 +108,13 @@ if [ -s ${tmptargets} ]; then
 fi
 rm -f ${tmptargets}
 
-XML_REPORT=${mydir}/report.xml
+XML_REPORT=${mydir}/report0.xml
 rm -f ${XML_REPORT} ${XML_REPORT}.part
+XML_LOG=${mydir}/report1.xml
+rm -f ${XML_LOG} ${XML_LOG}.part
 
 xml_report_print_header > ${XML_REPORT}.part
+xml_log_print_header > ${XML_LOG}.part
 
 for buildtarget in ${buildtargets}
 do
@@ -102,9 +133,12 @@ do
 
     ${failed} && status=1
     xml_report_print_row "${buildtarget}" "${failed}" >> $XML_REPORT.part
+    xml_log_print_field "${buildtarget}" ${mylog} >> $XML_LOG.part
 done
 
 xml_report_print_footer >> ${XML_REPORT}.part
+xml_log_print_footer >> ${XML_LOG}.part
 mv ${XML_REPORT}.part ${XML_REPORT}
+mv ${XML_LOG}.part ${XML_LOG}
 
 exit ${status}