[Qa-jenkins-scm] [jenkins.debian.net] 01/04: reproducible: build: requque a package for building in case of outadated builder and exit cleanly

[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 f411e67edd2803b8f5bafe111d326a3a9d71eba5
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Thu Sep 10 17:20:27 2015 +0000

    reproducible: build: requque a package for building in case of outadated builder and exit cleanly
---
 bin/reproducible_build.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 0b8eec6..3453d31 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -598,11 +598,10 @@ build_rebuild() {
 	fi
 	if [ ! -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] && [ -f b1/${SRCPACKAGE}_*_${ARCH}.changes ] ; then
 			echo "Version mismatch between main node (${SRCPACKAGE}_${EVERSION}_${ARCH}.dsc expected) and first build node ($(ls b1/*dsc)) for $SUITE/$ARCH, aborting. Please upgrade the schroots..." | tee -a ${RBUILDLOG}
-			# FIXME: this is wrong / not optimal, the build should be aborted cleanly and the package rescheduled, not depwait.
-			FTBFS=0
-		        calculate_build_duration
-			update_db_and_html "404"
-			handle_unhandled "Build of ${SRCPACKAGE} for $SUITE/$ARCH needs to be rescheduled" "5m"
+			# reschedule the package for later and quit the build without saving anything
+			sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started='' builder='' date_scheduled='$(date -u)' WHERE package_id='$SRCPKGID'"
+			NOTIFY=""
+			exit 0
 	elif [ -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then
 		# the first build did not FTBFS, try rebuild it.
 		check_for_race_conditions

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