summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-05-23 14:12:53 +0200
committerHolger Levsen <holger@layer-acht.org>2015-05-23 14:12:53 +0200
commitd464849cf02b70d102a989866722512e0c7202b5 (patch)
treeec5b1a188e1da1b8af3e4879bf2b7c92d6c200f6
parent4fcac275eb0a33a9c6822bf76c8471baee970d48 (diff)
downloadjenkins.debian.net-d464849cf02b70d102a989866722512e0c7202b5.tar.xz
reproducible: refactor
-rwxr-xr-xbin/reproducible_build.sh18
1 files changed, 9 insertions, 9 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 0ce7ce24..ec169668 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -131,6 +131,12 @@ update_db_and_html() {
echo
}
+update_rbuildlog() {
+ chmod 644 $RBUILDLOG
+ mv $RBUILDLOG $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log
+ RBUILDLOG=$BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log
+}
+
print_out_duration() {
local HOUR=$(echo "$DURATION/3600"|bc)
local MIN=$(echo "($DURATION-$HOUR*3600)/60"|bc)
@@ -145,9 +151,7 @@ handle_404() {
irc_message "$BUILD_URL encountered a 404 problem."
DURATION=''
EVERSION="None"
- chmod 644 $RBUILDLOG
- mv $RBUILDLOG $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log
- RBUILDLOG=$BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log
+ update_rbuildlog
update_db_and_html "404"
if [ $SAVE_ARTIFACTS -eq 1 ] ; then SAVE_ARTIFACTS=0 ; fi
if [ ! -z "$NOTIFY" ] ; then NOTIFY="failure" ; fi
@@ -157,10 +161,8 @@ handle_404() {
handle_not_for_us() {
# a list of valid architecture for this package should be passed to this function
echo "Package ${SRCPACKAGE} (${VERSION}) shall only be build on \"$(echo "$@" | xargs echo )\" and thus was skipped." | tee -a ${RBUILDLOG}
- chmod 644 $RBUILDLOG
- mv $RBUILDLOG $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log
- RBUILDLOG=$BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log
DURATION=''
+ update_rbuildlog
update_db_and_html "not for us"
if [ $SAVE_ARTIFACTS -eq 1 ] ; then SAVE_ARTIFACTS=0 ; fi
if [ ! -z "$NOTIFY" ] ; then NOTIFY="failure" ; fi
@@ -434,9 +436,7 @@ build_rebuild() {
fi
fi
cleanup_userContent
- chmod 644 $RBUILDLOG
- mv $RBUILDLOG $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log
- RBUILDLOG=$BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log
+ update_rbuildlog
rm $TMPCFG
if [ $FTBFS -eq 1 ] ; then handle_ftbfs ; fi
}