[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: minor refactoring

[Holger Levsen]

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


Commits:
8e8f4491 by Holger Levsen at 2019-09-13T11:06:31Z
minor refactoring

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

- - - - -
f63a2e2e by Holger Levsen at 2019-09-14T16:04:11Z
reproducible maintenance: also cleanup cruft from old Archlinux and OpenWrt builds

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

- - - - -


1 changed file:

- bin/reproducible_maintenance.sh


Changes:

=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -75,7 +75,7 @@ if [ ! -z "$TOOBIG" ] ; then
 fi
 
 #
-# delete old temp directories
+# delete old temp directories in $REP_RESULTS/rbuild-debian
 #
 echo "$(date -u) - Deleting temp directories in $REP_RESULTS/rbuild-debian, older than 3 days."
 OLDSTUFF=$(find $REP_RESULTS/rbuild-debian -maxdepth 1 -type d -mtime +2 -name "tmp.*" -exec ls -lad {} \; 2>/dev/null|| true)
@@ -118,6 +118,21 @@ if [ -d /srv/workspace/pbuilder/ ] ; then
 	fi
 fi
 
+#
+# delete old temp directories $REP_RESULTS/(archlinuxrb-build|rbuild-openwrt-results)-????????
+#
+echo "$(date -u) - Deleting temp directories in $REP_RESULTS/rbuild-debian, older than 3 days."
+OLDSTUFF=$(find $REP_RESULTS/ -maxdepth 1 -type d -mtime +2 -regextype awk -regex "$REP_RESULTS/(archlinuxrb-build|rbuild-openwrt-results)-........" -exec ls -lad {} \; 2>/dev/null|| true)
+if [ ! -z "$OLDSTUFF" ] ; then
+	echo
+	echo "Old archlinuxrb-build and rbuild-openwrt-results temp directories found in $REP_RESULTS/"
+	find $REP_RESULTS/ -maxdepth 1 -type d -mtime +2 -regextype awk -regex "$REP_RESULTS/(archlinuxrb-build|rbuild-openwrt-results)-........" -exec rm -rv --one-file-system {} \; || true
+	echo "These old directories have been deleted."
+	echo
+	DIRTY=true
+fi
+
+
 #
 # delete old chroot-installation directories (not related to reproducible builds)
 #
@@ -715,7 +730,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] && [ $(date -u +%H) -eq 0 ]  ; then
 		fi
 	done
 	# once a day, send notifications to package maintainers
-	cd /srv/reproducible-results/notification-emails
+	cd $REP_RESULTS/notification-emails
 	for NOTE in $(find . -type f) ; do
 			TMPFILE=$(mktemp --tmpdir=$TEMPDIR maintenance-XXXXXXXXXXXX)
 			PKG=$(basename $NOTE)



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/8b9bc6ba7e7761d333b7e0385250a5e66e03aad7...f63a2e2e4146a31f9aa52b8fad65e849d1f91fbf

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/8b9bc6ba7e7761d333b7e0385250a5e66e03aad7...f63a2e2e4146a31f9aa52b8fad65e849d1f91fbf
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/20190914/af049f2d/attachment-0001.html>