From: Jamo Luhrsen Date: Fri, 17 Feb 2017 23:00:05 +0000 (-0800) Subject: Report only the meaningful details in the report file being archived X-Git-Tag: release/boron-sr3~267 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=20454ba68d0193d3f597786f693886e9037c62f4;p=releng%2Fbuilder.git Report only the meaningful details in the report file being archived if the full output is desired, it will still exist in the consolelog of the jenkins job. Change-Id: I0219d15a681b10ed6ee63f73206d9433cb2aef3a Signed-off-by: Jamo Luhrsen --- diff --git a/jjb/integration/include-raw-integration-compare-distributions.sh b/jjb/integration/include-raw-integration-compare-distributions.sh index c8f1e8946..ae172ad36 100644 --- a/jjb/integration/include-raw-integration-compare-distributions.sh +++ b/jjb/integration/include-raw-integration-compare-distributions.sh @@ -24,7 +24,9 @@ git clone https://git.opendaylight.org/gerrit/p/integration/test.git cd test/tools/distchanges mkdir -p $WORKSPACE/archives -python distcompare.py -r ssh://jenkins-$SILO@git.opendaylight.org:29418 | tee $WORKSPACE/archives/dist_diff.txt -# TODO: the output of the above command is not *friendly* for the reader because the most important info -# is listed last. This is fine/best for command line output, but for keeping in a file it would be better -# to put the summary at the beginning of the file. Some bash magic can be done here to make that happen. +# Full output of compare tool will be in temp file /tmp/dist_diff.txt +# The file/report to be archived will only list the distribution in the comparison and the patches that +# are different. +python distcompare.py -r ssh://jenkins-$SILO@git.opendaylight.org:29418 | tee /tmp/dist_diff.txt +echo -e "Patch differences listed are in comparison to:\n\t$ACTUALBUNDLEURL\n\n" > $WORKSPACE/archives/distribution_differences.txt +sed -ne '/Patch differences/,$ p' /tmp/dist_diff.txt >> $WORKSPACE/archives/distribution_differences.txt