debian/changelog

@@ -4,6 +4,10 @@ piuparts (0.98) UNRELEASED; urgency=medium
   * piuparts-reports.py: add link to states graph for each suite.
   * instances/piuparts.conf-template.pejacevic: increase sid-nodoc's
     precedence.
+  * Refactor reschedule_piuparts_tests to use new global configuration
+    variable 'testing-suite'.
+  * generate_daily_report: show failures in sid, $TESTING and testing2sid
+    at the top of the report.
   * Update TODO for bullseye.
 
   [ Andreas Beckmann ]

instances/piuparts.conf-template.pejacevic

@@ -213,6 +213,7 @@ sections =
 	squeeze2squeeze-lts
 	squeeze
 	lenny2squeeze
+testing-suite = buster
 mirror = @MIRROR@
 master-host = pejacevic.debian.org
 master-user = piupartsm

instances/piuparts.conf.anbe

@@ -406,6 +406,8 @@ sections =
 	lenny_i386/non-free
 	lenny2squeeze/non-free
 #
+testing-suite = buster
+#
 json-sections = none
 #
 proxy = http://localhost:3128

master-bin/generate_daily_report.in

 #!/bin/sh
 
 # Copyright © 2011-2013 Andreas Beckmann (anbe@debian.org)
-# Copyright © 2018 Holger Levsen (holger@layer-acht.org)
+# Copyright © 2018-2019 Holger Levsen (holger@layer-acht.org)
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -24,6 +24,7 @@ get_config_value SECTIONS global sections
 get_config_value HTDOCS global output-directory
 get_config_value URLBASE global urlbase https://piuparts.debian.org
 get_config_value PYTHONPATH global PYTHONPATH ''
+get_config_value TESTING global testing-suite
 
 export PYTHONPATH
 
@@ -82,7 +83,9 @@ for SECTION in $SECTIONS ; do
 done | sed s#^$MASTER#$URLBASE# >> $DAILYTMP
 
 echo "$(cat $DAILYTMP | wc -l) new failures:" >> $DAILYREPORT
-cat $DAILYTMP >> $DAILYREPORT
+# show failures (and show failures in sid, $TESTING and testing2sid first
+cat $DAILYTMP | (egrep "/(sid|$TESTING|testing2sid)/" 2>/dev/null || true) >> $DAILYREPORT
+cat $DAILYTMP | (egrep -v "/(sid|$TESTING|testing2sid)/" 2>/dev/null || true) >> $DAILYREPORT
 rm $DAILYTMP
 
 echo "" >> $DAILYREPORT

master-bin/reschedule_piuparts_tests.in

@@ -2,6 +2,7 @@
 set -e
 
 # Copyright © 2013-2017 Andreas Beckmann (anbe@debian.org)
+# Copyright © 2018 Holger Levsen (holger@layer-acht.org)
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -21,9 +22,7 @@ set -e
 
 get_config_value MASTER global master-directory
 get_config_value SECTIONS global sections
-
-
-TESTING="buster"
+get_config_value TESTING global testing-suite
 
 dryrun=""
 current=""