summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-09-10 17:20:27 +0000
committerHolger Levsen <holger@layer-acht.org>2015-09-10 19:23:22 +0200
commitf411e67edd2803b8f5bafe111d326a3a9d71eba5 (patch)
tree26188aacc9af585f54e998c875e7177da1e6da06 /bin
parenta5680faf836e4e1a71e8312dfb2a2b2d91ff9fa5 (diff)
downloadjenkins.debian.net-f411e67edd2803b8f5bafe111d326a3a9d71eba5.tar.xz
reproducible: build: requque a package for building in case of outadated builder and exit cleanly
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 0b8eec6f..3453d319 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