[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Archlinux: trap exit so we still end the schroot session on failures

[Holger Levsen]

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


Commits:
43fa8d16 by Holger Levsen at 2018-10-07T14:47:58Z
reproducible Archlinux: trap exit so we still end the schroot session on failures

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

- - - - -


1 changed file:

- bin/reproducible_archlinux_scheduler.sh


Changes:

=====================================
bin/reproducible_archlinux_scheduler.sh
=====================================
@@ -12,6 +12,10 @@ common_init "$@"
 
 set -e
 
+cleanup_all() {
+	schroot --end-session -c $SESSION 2>/dev/null|| true
+}
+
 update_archlinux_repositories() {
 	#
 	# init
@@ -25,7 +29,6 @@ update_archlinux_repositories() {
 	query_db "SELECT suite, name, version FROM sources WHERE architecture='$ARCH';" > $KNOWN
 	echo "$(date -u ) - $(cat $KNOWN | wc -l) Arch Linux packages are known in our database."
 	# init session
-	local SESSION="archlinux-scheduler-$RANDOM"
 	schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-archlinux
 	echo "$(date -u ) - updating pacman's knowledge of Arch Linux repositories (by running pacman -Syu --noconform')."
 	schroot --run-session -c $SESSION --directory /var/tmp -- sudo pacman -Syu --noconfirm
@@ -254,7 +257,10 @@ update_archlinux_repositories() {
 	rm -f $NEW $UPDATED $KNOWN > /dev/null
 }
 
+trap cleanup_all INT TERM EXIT
 ARCH="x86_64"
+SESSION="archlinux-scheduler-$RANDOM"
 update_archlinux_repositories
+trap - INT TERM EXIT
 
 # vim: set sw=0 noet :



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/43fa8d168b2d17f7a2c4bc410e5a2ce3f2e83d8a

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/43fa8d168b2d17f7a2c4bc410e5a2ce3f2e83d8a
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/20181007/4b536783/attachment-0001.html>