[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible worker: log failing package/suite too

[Holger Levsen (@holger)]

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


Commits:
9d2a5bce by Holger Levsen at 2023-06-10T03:05:05+02:00
reproducible worker: log failing package/suite too

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

- - - - -


1 changed file:

- bin/reproducible_worker.sh


Changes:

=====================================
bin/reproducible_worker.sh
=====================================
@@ -22,11 +22,11 @@ common_init "$@"
 . /srv/jenkins/bin/reproducible_common.sh
 
 notify_log_of_failure() {
+	local PKG_SUITE="$1"
 	tee -a /var/log/jenkins/reproducible-builder-errors.log <<-END
 
-		$(date -u) - $WORKER_NAME/$BUILD_ID exited with an error.  Return code: $RETCODE
-		Check out the log at $BUILD_URL
-
+		$(date -u) - $WORKER_NAME/$BUILD_ID for $PKG_SUITE exited with error code: $RETCODE
+		Check out $BUILD_URL
 		END
 }
 
@@ -91,10 +91,13 @@ main_loop() {
 	echo
 	RETCODE=0
 	/srv/jenkins/bin/reproducible_build.sh $NODE1 $NODE2 >$BUILD_BASE/$BUILD_ID/console.log 2>&1 || RETCODE=$?
+
+	if [ "$RETCODE" -ne 0 ] ; then
+		local FAILED="$(grep '^Initialising reproducibly build' $BUILD_BASE/$BUILD_ID/console.log | cut -d ' ' -f5-7)"
+		 notify_log_of_failure "$FAILED"
+	fi
 	gzip $BUILD_BASE/$BUILD_ID/console.log || true
 	echo
-
-	[ "$RETCODE" -eq 0 ] || notify_log_of_failure
 }
 
 #



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/9d2a5bce702ead3bcdcefa5466224d94aa632abb
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/20230610/6b8ad85a/attachment-0001.htm>