[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: unclutter output of maintenance job

[Holger Levsen]

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


Commits:
afc2e2fe by Holger Levsen at 2019-09-02T13:16:56Z
reproducible Debian: unclutter output of maintenance job

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

- - - - -


1 changed file:

- bin/reproducible_maintenance.sh


Changes:

=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -433,7 +433,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
 	# (ignore "*None.rbuild.log" because these are build which were just started)
 	# this job runs every 4h
 	echo "$(date -u) - Rescheduling failed builds due to network issues."
-	FAILED_BUILDS=$(find $DEBIAN_BASE/rbuild -type f ! -name "*None.rbuild.log" ! -mmin +300 -exec zgrep -l -E 'E: Failed to fetch.*(Unable to connect to|Connection failed|Size mismatch|Cannot initiate the connection to|Bad Gateway|Service Unavailable)' {} \; || true)
+	FAILED_BUILDS=$(find $DEBIAN_BASE/rbuild -type f ! -name "*None.rbuild.log" ! -mmin +300 -exec zgrep -l -E 'E: Failed to fetch.*(Unable to connect to|Connection failed|Size mismatch|Cannot initiate the connection to|Bad Gateway|Service Unavailable)' {} \; 2>/dev/null || true)
 	if [ ! -z "$FAILED_BUILDS" ] ; then
 		echo
 		echo "The following builds have failed due to network problems and will be rescheduled now:"
@@ -465,7 +465,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
 	# (ignore "*None.rbuild.log" because these are build which were just started)
 	# this job runs every 4h
 	echo "$(date -u) - Rescheduling failed builds due to diffoscope schroot issues."
-	FAILED_BUILDS=$(find $DEBIAN_BASE/rbuild -type f ! -name "*None.rbuild.log" ! -mmin +300 -exec zgrep -l -F 'E: 10mount: error: Directory' {} \; || true)
+	FAILED_BUILDS=$(find $DEBIAN_BASE/rbuild -type f ! -name "*None.rbuild.log" ! -mmin +300 -exec zgrep -l -F 'E: 10mount: error: Directory' {} \; 2>/dev/null|| true)
 	if [ ! -z "$FAILED_BUILDS" ] ; then
 		echo
 		echo "Warning: The following builds have failed due to diffoscope schroot problems and will be rescheduled now:"
@@ -538,7 +538,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
 				WHERE name='$PKGNAME' AND suite='$SUITE' AND architecture='$ARCH'"
 			query_db "$QUERY"
 			cd $DEBIAN_BASE
-			find rb-pkg/$SUITE/$ARCH rbuild/$SUITE/$ARCH dbd/$SUITE/$ARCH dbdtxt/$SUITE/$ARCH buildinfo/$SUITE/$ARCH logs/$SUITE/$ARCH logdiffs/$SUITE/$ARCH -name "${PKGNAME}_*" | xargs -r rm -v || echo "Warning: couldn't delete old files from ${PKGNAME} in $SUITE/$ARCH"
+			find rb-pkg/$SUITE/$ARCH rbuild/$SUITE/$ARCH dbd/$SUITE/$ARCH dbdtxt/$SUITE/$ARCH buildinfo/$SUITE/$ARCH logs/$SUITE/$ARCH logdiffs/$SUITE/$ARCH -name "${PKGNAME}_*" 2>/dev/null | xargs -r rm -v || echo "Warning: couldn't delete old files from ${PKGNAME} in $SUITE/$ARCH"
 		done
 		cd - > /dev/null
 	fi
@@ -548,7 +548,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
 	# delete jenkins html logs from reproducible_builder_(fedora|archlinux)* jobs as they are mostly redundant
 	# (they only provide the extended value of parsed console output, which we dont need here.)
 	#
-	OLDSTUFF=$(find /var/lib/jenkins/jobs/reproducible_builder_* -maxdepth 3 -mtime +0 -name log_content.html  -exec rm -v {} \; | wc -l)
+	OLDSTUFF=$(find /var/lib/jenkins/jobs/reproducible_builder_* -maxdepth 3 -mtime +0 -name log_content.html  -exec rm -v {} \; 2>/dev/null | wc -l)
 	if [ ! -z "$OLDSTUFF" ] ; then
 		echo
 		echo "Removed $OLDSTUFF jenkins html logs."



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/afc2e2feb81fbc76d35b6d8b9fa92d294e72969c
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/20190902/2367850d/attachment-0001.html>