[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Archlinux: try to be less error prone when ending schroot sessions

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
32b9fe26 by Holger Levsen at 2019-11-24T17:30:25Z
reproducible Archlinux: try to be less error prone when ending schroot sessions

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_build_archlinux_pkg.sh


Changes:

=====================================
bin/reproducible_build_archlinux_pkg.sh
=====================================
@@ -172,6 +172,7 @@ first_build() {
 	if [ $PRESULT -eq 124 ] ; then
 		echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG
 	fi
+	set +e
 	schroot --end-session -c $SESSION | tee -a $LOG
 	PRESULT=${PIPESTATUS[0]}
 	if [ $PRESULT -ne 0 ] ; then
@@ -196,6 +197,7 @@ first_build() {
 		fi
 	fi
 	if ! "$DEBUG" ; then set +x ; fi
+	set -e
 }
 
 second_build() {
@@ -259,6 +261,7 @@ second_build() {
 	if [ $PRESULT -eq 124 ] ; then
 		echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG
 	fi
+	set +e
 	schroot --end-session -c $SESSION | tee -a $LOG
 	PRESULT=${PIPESTATUS[0]}
 	if [ $PRESULT -ne 0 ] ; then
@@ -277,6 +280,7 @@ second_build() {
 		fi
 	fi
 	if ! "$DEBUG" ; then set +x ; fi
+	set -e
 }
 
 remote_build() {



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/32b9fe2699cc3359f4480c64cae5a4b6d6de8b24

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/32b9fe2699cc3359f4480c64cae5a4b6d6de8b24
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20191124/ef2d51c9/attachment-0001.html>