[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible arch: prefix schroot session names with 'arch-' and clean them up properly on failures

[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 ad91f92fda3fb7f4b39d5c90337688bfa8f1e6bc
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Oct 16 17:06:52 2015 +0200

    reproducible arch: prefix schroot session names with 'arch-' and clean them up properly on failures
---
 bin/reproducible_build_arch_pkg.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh
index fe3f3cb..12763d4 100755
--- a/bin/reproducible_build_arch_pkg.sh
+++ b/bin/reproducible_build_arch_pkg.sh
@@ -13,6 +13,9 @@ cleanup_all() {
 	cd
 	rm $TMPDIR -r
 	echo "$(date -u) - $TMPDIR deleted."
+	if [ "$MODE" != "master" ] ;
+		schroot --end-session -c arch-$SRCPACKAGE
+	fi
 }
 
 handle_remote_error() {
@@ -31,10 +34,10 @@ first_build() {
 	echo "Date UTC: $(date -u)"
 	echo "============================================================================="
 	set -x
-	schroot --begin-session --session-name=$SRCPACKAGE -c jenkins-reproducible-arch
-	schroot --run-session -c $SRCPACKAGE --directory /tmp -- cp -r /var/abs/core/$SRCPACKAGE /tmp
-	schroot --run-session -c $SRCPACKAGE --directory /tmp/$SRCPACKAGE -- makepkg --skippgpcheck
-	schroot --end-session -c $SRCPACKAGE
+	schroot --begin-session --session-name=arch-$SRCPACKAGE -c jenkins-reproducible-arch
+	schroot --run-session -c arch-$SRCPACKAGE --directory /tmp -- cp -r /var/abs/core/$SRCPACKAGE /tmp
+	schroot --run-session -c arch-$SRCPACKAGE --directory /tmp/$SRCPACKAGE -- makepkg --skippgpcheck
+	schroot --end-session -c arch-$SRCPACKAGE
 	if ! "$DEBUG" ; then set +x ; fi
 }
 
@@ -45,10 +48,10 @@ second_build() {
 	echo "Date UTC: $(date -u)"
 	echo "============================================================================="
 	set -x
-	schroot --begin-session --session-name=$SRCPACKAGE -c jenkins-reproducible-arch
-	schroot --run-session -c $SRCPACKAGE --directory /tmp -- cp -r /var/abs/core/$SRCPACKAGE /tmp
-	schroot --run-session -c $SRCPACKAGE --directory /tmp/$SRCPACKAGE -- makepkg --skippgpcheck
-	schroot --end-session -c $SRCPACKAGE
+	schroot --begin-session --session-name=arch-$SRCPACKAGE -c jenkins-reproducible-arch
+	schroot --run-session -c arch-$SRCPACKAGE --directory /tmp -- cp -r /var/abs/core/$SRCPACKAGE /tmp
+	schroot --run-session -c arch-$SRCPACKAGE --directory /tmp/$SRCPACKAGE -- makepkg --skippgpcheck
+	schroot --end-session -c arch-$SRCPACKAGE
 	if ! "$DEBUG" ; then set +x ; fi
 }
 

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