[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible trbo system health check: detect pacman db locks

[Holger Levsen]

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


Commits:
2e0415c7 by Holger Levsen at 2020-12-02T17:27:18+01:00
reproducible trbo system health check: detect pacman db locks

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

- - - - -


2 changed files:

- bin/reproducible_maintenance.sh
- bin/reproducible_system_health.sh


Changes:

=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -362,9 +362,12 @@ case $HOSTNAME in
 		schroot --directory /tmp -c source:jenkins-reproducible-archlinux -u root -- pacman -Syu --noconfirm
 		RESULT=$?
 		if [ $RESULT -eq 1 ] ; then
-			echo "Warning: failed to update Arch Linux schroot."
-			echo "Let's see if /var/lib/pacman/db.lck exists in the schroot."
-			schroot --directory /tmp -c source:jenkins-reproducible-archlinux -u root -- ls /var/lib/pacman/db.lck
+			echo "Let's see if /var/lib/pacman/db.lck exists in the schroot..."
+			if [ "$(schroot --directory /tmp -c source:jenkins-reproducible-archlinux -u root -- ls /var/lib/pacman/db.lck)" = "/var/lib/pacman/db.lck" ] ; then
+				echo "Warning: failed to update Arch Linux schroot, pacman/db.lck exists."
+			else
+				echo "Warning: failed to update Arch Linux schroot."
+			fi
 			DIRTY=true
 		else
 			echo "$(date -u) - updating Arch Linux schroot done."


=====================================
bin/reproducible_system_health.sh
=====================================
@@ -179,6 +179,8 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
 			small_note "node in starting state"
 		elif $(grep -E -q "Reading package lists...Warning: failed to update the .* chdist." $LOG) ; then
 			small_note "failed to update Debian chdist"
+		elif $(grep -q "Warning: failed to update Arch Linux schroot, pacman/db.lck exists." $LOG) ; then
+			small_note "pacman/db.lck exists, thus failing to update Arch Linux schroot, manual intervention required"
 		elif $(grep -q "Warning: failed to update Arch Linux schroot." $LOG) ; then
 			small_note "failed to update Arch Linux schroot"
 		elif $(grep -q "Warning: sbuild failed. Exiting cleanly as this is out-of-scope" $LOG) ; then



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/2e0415c75c20565729918064a3bb5c8c2337b0a2

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/2e0415c75c20565729918064a3bb5c8c2337b0a2
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/20201202/5fd25436/attachment-0001.html>