diff options
| author | Mattia Rizzolo <mattia@mapreri.org> | 2015-04-06 15:37:58 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-04-18 17:20:08 +0200 |
| commit | e894db84ed99e13bb473076401ff9a1a7cd88f27 (patch) | |
| tree | 68c220d17a31cc89ba5a202d0a2dc4443828bc09 | |
| parent | 54b0fa01596eea59a75973f358378f58cb31ad21 (diff) | |
| download | jenkins.debian.net-e894db84ed99e13bb473076401ff9a1a7cd88f27.tar.xz | |
reproducible: build: refactor: call_debbindiff(): print out debbindiff output also to the stdout, aka jenkins log
| -rwxr-xr-x | bin/reproducible_build.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index b43290a8..7472c559 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -179,16 +179,25 @@ dbd_timeout() { } call_debbindiff() { - init_debbindiff + init_debbindiff # check and set up locks for chroot + local TMPLOG=(mktemp --tmpdir=$PWD) echo | tee -a ${RBUILDLOG} TIMEOUT="30m" # don't forget to also change the "seq 0 200" loop 17 lines above DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --version 2>&1)" echo "$(date) - $DBDVERSION will be used to compare the two builds now." | tee -a ${RBUILDLOG} set -x - ( timeout $TIMEOUT schroot --directory $TMPDIR -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --html ./${DBDREPORT} ./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes 2>&1 ) 2>&1 >> ${RBUILDLOG} + ( timeout $TIMEOUT schroot \ + --directory $TMPDIR \ + -c source:jenkins-reproducible-unstable-debbindiff \ + debbindiff -- \ + --html ./${DBDREPORT} \ + ./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes \ + ./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes 2>&1 \ + ) 2>&1 >> $TMPLOG RESULT=$? set +x - rm -f $DBDCHROOT_READLOCK + cat $TMPLOG | tee -a $RBUILDLOG + rm -f $DBDCHROOT_READLOCK $TMPLOG echo | tee -a ${RBUILDLOG} case $RESULT in 124) |