[Piuparts-commits] rev 376 - piatti/home/piupartsm/bin

[Holger Levsen]

Author: holger
Date: 2009-04-27 16:23:42 +0000 (Mon, 27 Apr 2009)
New Revision: 376

Modified:
   piatti/home/piupartsm/bin/report_persistent_untestable_packages
   piatti/home/piupartsm/bin/report_untestable_packages
Log:
- use variables to ease changing intervals
- find packages which are in the untestable-archive but have been tested by now, remove those logs so the won't show up later



Modified: piatti/home/piupartsm/bin/report_persistent_untestable_packages
===================================================================
--- piatti/home/piupartsm/bin/report_persistent_untestable_packages	2009-04-27 14:39:44 UTC (rev 375)
+++ piatti/home/piupartsm/bin/report_persistent_untestable_packages	2009-04-27 16:23:42 UTC (rev 376)
@@ -17,17 +17,34 @@
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 MASTER=/org/piuparts.debian.org/master
+DISTROS="sid squeeze"
+DAYS=15 
 
 #
-# find packages which have been in untestable for more than 15 days and reschedule them for testing
+# find packages which are in the untestable-archive but have been tested by now,
+# remove those logs so the won't show up later
 #
+for distro in $DISTROS ; do
+	for package_log in $(find $MASTER/$distro/untestable/archive/ -name "*.log"); do
+		for dir in "pass failed bugged" ; do
+			FILE=$(basename $package_log)
+			if [ -f $MASTER/$distro/$dir/$FILE ] ; then
+				rm $package_log
+			fi
+		done
+	done
+done
+	
+#
+# find packages which have been in untestable for more than $DAYS days and reschedule them for testing
+#
 
-find $MASTER/*/untestable/archive -mtime +15 -name "*.log" > $LOGS
+find $MASTER/*/untestable/archive -mtime +$DAYS -name "*.log" > $LOGS
 if [ -s $LOGS ] ; then 
 	for package_log in $(cat $LOGS) ; do 
-			rm -f $package_log
+		rm -f $package_log
 	done
-	echo "Persistent untestable packages detected, which have been untestable for 15 days!"
+	echo "Persistent untestable packages detected, which have been untestable for $DAYS days!"
 	echo
 	echo "This is quite unusual, please investigate, probably using http://edos.debian.net/edos-debcheck/"
 	echo

Modified: piatti/home/piupartsm/bin/report_untestable_packages
===================================================================
--- piatti/home/piupartsm/bin/report_untestable_packages	2009-04-27 14:39:44 UTC (rev 375)
+++ piatti/home/piupartsm/bin/report_untestable_packages	2009-04-27 16:23:42 UTC (rev 376)
@@ -18,13 +18,14 @@
 
 MASTER=/org/piuparts.debian.org/master
 DISTROS="sid squeeze"
+DAYS=5 
 
 #
-# find packages which have been in untestable for more than 5 days and reschedule them for testing
+# find packages which have been in untestable for more than $DAYS days and reschedule them for testing
 #
 
 LOGS=`mktemp`
-find $MASTER/*/untestable/ -mtime +5 -name "*.log" > $LOGS
+find $MASTER/*/untestable/ -mtime +$DAYS -name "*.log" > $LOGS
 if [ -s $LOGS ] ; then 
 	for distro in $DISTROS ; do
 		mkdir -p $MASTER/$distro/untestable/archive
@@ -35,7 +36,7 @@
 			rm -f $package_log
 		done
 	done
-	echo "Untestable packages detected, which have been tested more than 5 days ago!"
+	echo "Untestable packages detected, which have been tested more than $DAYS days ago!"
 	echo "These packages have been rescheduling for piuparts testing."
 	echo
 	echo "If they continue to fail testing, you will be informed again in 10 days."