[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: allow maximum of 30min for diffing the two build logs

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 6eb52d04bc077bb45ca568c4dac49efeceb9bf8b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Sep 13 16:35:27 2017 +0200

    reproducible Debian: allow maximum of 30min for diffing the two build logs
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index c252664..96acd93 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -179,9 +179,12 @@ diff_copy_buildlogs() {
 	if [ -f b1/build.log ] ; then
 		if [ -f b2/build.log ] ; then
 			printf "Diff of the two buildlogs:\n\n--\n" | tee -a $DIFF
-			diff -u b1/build.log b2/build.log | tee -a $DIFF
+			LOCALDIFFTIMEOUT="30m"
+			timeout $LOCALDIFFTIMEOUT diff -u b1/build.log b2/build.log | tee -a $DIFF
 			if [ ${PIPESTATUS[0]} -eq 0 ] ; then
 				echo "The two build logs are identical! \o/" | tee -a $DIFF
+			elif [ ${PIPESTATUS[0]} -eq 124 ] ; then
+				echo "Diffing the two build logs ran into timeout after $LOCALDIFFTIMEOUT, sorry." | tee -a $DIFF
 			fi
 			echo -e "\nCompressing the 2nd log..."
 			gzip -9vn $DIFF

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git