From b8fe913364bef62a551d2c5d7cd08ad79150bde3 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 5 Oct 2014 10:25:14 +0200 Subject: reproducible: don't preserve artefacts as a proper jenkins job result --- bin/reproducible_build.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index f20ab919..d8998e34 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -101,7 +101,6 @@ SOURCELESS="" SKIPPED="" trap cleanup_all INT TERM EXIT cd $TMPDIR -mkdir -p results/ for SRCPACKAGE in ${PACKAGES} ; do set +x echo "=============================================================================" @@ -158,9 +157,8 @@ for SRCPACKAGE in ${PACKAGES} ; do cat b1/${SRCPACKAGE}_${EVERSION}_amd64.changes LOGFILE=$(ls ${SRCPACKAGE}_${EVERSION}.dsc) LOGFILE=$(echo ${LOGFILE%.dsc}.debbindiff.html) - rm -f ./results/${LOGFILE} > /dev/null 2>&1 - /var/lib/jenkins/debbindiff.git/debbindiff.py --html ./results/${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes || true - if [ ! -f ./results/${LOGFILE} ] ; then + /var/lib/jenkins/debbindiff.git/debbindiff.py --html ./${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes || true + if [ ! -f ./${LOGFILE} ] ; then rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1 rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1 figlet ${SRCPACKAGE} @@ -172,7 +170,7 @@ for SRCPACKAGE in ${PACKAGES} ; do else rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1 rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1 - cp ./results/${LOGFILE} /var/lib/jenkins/userContent/dbd/ + mv ./${LOGFILE} /var/lib/jenkins/userContent/dbd/ sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO source_packages VALUES (\"${SRCPACKAGE}\", \"${VERSION}\", \"unreproducible\", \"$DATE\")" set +x echo "Warning: ${SRCPACKAGE} failed to build reproducibly." -- cgit v1.2.3-70-g09d2