diff options
author | Holger Levsen <holger@layer-acht.org> | 2015-10-17 17:13:24 +0200 |
---|---|---|
committer | Holger Levsen <holger@layer-acht.org> | 2015-10-17 17:13:24 +0200 |
commit | 6de8b04c1d0d77e0f5054a079452d4031fe686c4 (patch) | |
tree | 6ec118dbdb3ed9412df3c61f0cc99658854044aa | |
parent | 1388c723cab847fced6a6b51291e93d3b478b9a4 (diff) | |
download | jenkins.debian.net-6de8b04c1d0d77e0f5054a079452d4031fe686c4.tar.xz |
reproducible arch: ignore arch schroot sessions in maintenance
-rw-r--r-- | TODO | 2 | ||||
-rwxr-xr-x | bin/common-functions.sh | 8 |
2 files changed, 8 insertions, 2 deletions
@@ -302,7 +302,9 @@ properties: * more random notes: ** patch pacman to create .buildinfo files - or better: wait ** rename arch scripts and jobs to archlinux +*** remember to adop cleanup_schroot_sessions() in common_functions.sh when renaming the schroots ** use archlinux.css not the one from freebsd :) +*** use arch logo ---- notes on source and binary versions: diff --git a/bin/common-functions.sh b/bin/common-functions.sh index 163833ee..aa765272 100755 --- a/bin/common-functions.sh +++ b/bin/common-functions.sh @@ -136,11 +136,15 @@ cleanup_schroot_sessions() { local RESULT="" for loop in $(seq 0 40) ; do # first, check if no process using "schroot" is running, if thats the case, loop through all schroot sessions: - pgrep -f "schroot --directory" || for i in $(schroot --all-sessions -l ) ; do + # arch sessions are ignored, because they are handled properly + pgrep -f "schroot --directory" || for i in $(schroot --all-sessions -l |grep -v "session:arch") ; do # then, check that schroot is still not run, and then delete the session + if [ -z $i ] ; then + continue + fi pgrep -f "schroot --directory" || schroot -e -c $i done - RESULT=$(schroot --all-sessions -l) + RESULT=$(schroot --all-sessions -l|grep -v "session:arch") if [ -z "$RESULT" ] ; then echo "No schroot sessions in use atm..." echo |