[Git][qa/jenkins.debian.net][master] reproducible Arch Linux: improve handling when database is locked

[Holger Levsen (@holger)]

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


Commits:
d9eb9984 by Holger Levsen at 2024-03-16T15:31:40+01:00
reproducible Arch Linux: improve handling when database is locked

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
=====================================
@@ -682,14 +682,15 @@ set +e
 case $HOSTNAME in
 	osuosl1-amd64|osuosl2-amd64|jenkins)
 		echo "$(date -u) - updating Arch Linux schroot now."
-		schroot --directory /tmp -c source:jenkins-reproducible-archlinux -u root -- pacman -Syu --noconfirm
+		SCHROOT=source:jenkins-reproducible-archlinux
+		schroot --directory /tmp -c $SCHROOT -u root -- pacman -Syu --noconfirm
 		RESULT=$?
 		if [ $RESULT -eq 1 ] ; then
 			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."
+			if [ "$(schroot --directory /tmp -c $SCHROOT -u root -- ls /var/lib/pacman/db.lck)" = "/var/lib/pacman/db.lck" ] ; then
+				echo "Warning: failed to update Arch Linux schroot $SCHROOT, pacman/db.lck exists."
 			else
-				echo "Warning: failed to update Arch Linux schroot."
+				echo "Warning: failed to update Arch Linux schroot $SCHROOT.."
 			fi
 			DIRTY=true
 		else


=====================================
bin/reproducible_system_health.sh
=====================================
@@ -204,9 +204,9 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
 			small_note "undefined service problems"
 		elif $(grep -E -q "Warning: failed to update .* 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
+		elif $(grep -E -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
+		elif $(grep -q "Warning: failed to update Arch Linux schroot" $LOG) ; then
 			small_note "failed to update Arch Linux schroot"
 		elif $(grep -q "Warning: today is the wrong future." $LOG) ; then
 			small_note "host date is the wrong future date"
@@ -355,6 +355,8 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
 			small_note "build failed"
 		elif $(grep -q "^client_loop: send disconnect: Broken pipe" $LOG) ; then
 			small_note "broken pipe"
+		elif $(grep -q "error: failed to synchronize all databases (unable to lock database)." $LOG) ; then
+			small_note "failure to lock database"
 		fi
 		case $JOB_NAME in
 			reproducible_maintenance_amd64_jenkins)			MODIFIER=250 ;; # main node



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/d9eb9984675698f12c0adbb7bf651917f81eb7ae
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/20240316/dd0d7f60/attachment-0001.htm>