From 5b38222cd37b455d4bf0ce57098772648b856ec0 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Sat, 11 Oct 2014 12:52:26 +0200
Subject: reproducible: run pbuilder with 12h timeout

---
 TODO                      | 6 +++---
 bin/reproducible_build.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TODO b/TODO
index f5569221..7be85541 100644
--- a/TODO
+++ b/TODO
@@ -111,7 +111,9 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 *** scheduler and builder jobs are started after
 
 * bugs
-** when notes are removed the navigation pages are not updated... (touch note_new on create, then on next run delete on all navi pages for which note_new exists)
+** when notes are removed the navigation pages are not updated... 
+*** always create notes + navi pages if note exist
+*** check if package has a note which is older than navi page -> delete note
 *** modify packages.yml locally to test...
 ** add note about notes on every page which has them...
 
@@ -122,9 +124,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 * watch: haskell-hsql-odbc (debbindiff error only in jenkins log, not in rbuild log
 * watch: cxxtest: dbd failure should be in rbuild output!
 * watch: android: no debbindiff output?
-* watch: swig/subversion (FTBFS, report note at least...)
 * watch: hurd-libfuse: should be not for us
-* run pbuilder with timeout 12h
 * new view: issues (show all issues in one page and the packages which are affected.)
 * generate .json for tracker.d.o
 * reschedule all pkg tested before oct 06 00:00 UTC (we want to know if they generate .buildinfo files)
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 1e8e42b9..ea6b0e8c 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -180,7 +180,7 @@ for SRCPACKAGE in ${PACKAGES} ; do
 			dcmd rm ${SRCPACKAGE}_${EVERSION}.dsc
 			continue
 		fi
-		nice ionice -c 3 sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_*.dsc 2>&1 | tee -a ${RBUILDLOG}
+		( timeout 15m nice ionice -c 3 sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_*.dsc ) 2>&1 | tee -a ${RBUILDLOG}
 		if [ -f /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes ] ; then
 			mkdir b1 b2
 			dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes b1
@@ -188,7 +188,7 @@ for SRCPACKAGE in ${PACKAGES} ; do
 			# so first delete files from .dsc, then from .changes file
 			sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}.dsc
 			sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes
-			nice ionice -c 3 sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_${EVERSION}.dsc
+			timeout 12h nice ionice -c 3 sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_${EVERSION}.dsc
 			dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes b2
 			# and again (see comment 5 lines above)
 			sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}.dsc
-- 
cgit v1.2.3-70-g09d2