reproducible Debian: show stats related to buster (instead of stretch) in the dashboard

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

2 files changed, 16 insertions, 16 deletions

diff --git a/TODO4buster.txt b/TODO4buster.txt
index b1a3baf6..cb52bf2c 100644
--- a/TODO4buster.txt
+++ b/TODO4buster.txt
@@ -6,6 +6,5 @@ changes not yet prepared in git
 -------------------------------
 missing bits for the buster coming:
  * _common.sh (only partly done so far…)
- * _dashboard.sh
  * _repository_comparison.sh
 finally, remove this file again.
diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh
index 4864fab4..5600b476 100755
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -329,12 +329,13 @@ write_build_performance_stats() {
 	for ARCH in ${ARCHS} ; do
 		write_page " <th>$ARCH</th>"
 	done
-	write_page "</tr><tr><td class=\"left\">oldest build result in stretch / unstable / experimental</td>"
+	write_page "</tr><tr><td class=\"left\">oldest build result in stretch / buster / unstable / experimental</td>"
 	for ARCH in ${ARCHS} ; do
 		AGE_UNSTABLE=$(query_db "SELECT CAST(greatest(max(oldest_reproducible), max(oldest_unreproducible), max(oldest_FTBFS)) AS INTEGER) FROM ${TABLE[2]} WHERE suite='unstable' AND architecture='$ARCH' AND datum='$DATE'")
 		AGE_EXPERIMENTAL=$(query_db "SELECT CAST(greatest(max(oldest_reproducible), max(oldest_unreproducible), max(oldest_FTBFS)) AS INTEGER) FROM ${TABLE[2]} WHERE suite='experimental' AND architecture='$ARCH' AND datum='$DATE'")
 		AGE_STRETCH=$(query_db "SELECT CAST(greatest(max(oldest_reproducible), max(oldest_unreproducible), max(oldest_FTBFS)) AS INTEGER) FROM ${TABLE[2]} WHERE suite='stretch' AND architecture='$ARCH' AND datum='$DATE'")
-		write_page "<td>$AGE_STRETCH / $AGE_UNSTABLE / $AGE_EXPERIMENTAL days</td>"
+		AGE_BUSTER=$(query_db "SELECT CAST(greatest(max(oldest_reproducible), max(oldest_unreproducible), max(oldest_FTBFS)) AS INTEGER) FROM ${TABLE[2]} WHERE suite='buster' AND architecture='$ARCH' AND datum='$DATE'")
+		write_page "<td>$AGE_STRETCH / $AGE_BUSTER / $AGE_UNSTABLE / $AGE_EXPERIMENTAL days</td>"
 	done
 	write_page "</tr><tr><td class=\"left\">Build jobs configured</td>"
 	for ARCH in ${ARCHS} ; do
@@ -553,10 +554,10 @@ create_dashboard_page() {
 	local TD_PKG_SID_FTBR="<tr><td class=\"left\">&nbsp;&nbsp;- unreproducible ones</a></td><td></td>"
 	local TD_PKG_SID_FTBFS="<tr><td class=\"left\">&nbsp;&nbsp;- failing to build</a></td><td></td>"
 	local TD_PKG_SID_ISSUES="<tr><td class=\"left\">packages in unstable which need to be fixed</td><td></td>"
-	local TD_PKG_STRETCH_NOISSUES="<tr><td class=\"left\">packages in stretch with issues but without identified ones</td><td></td>"
-	local TD_PKG_STRETCH_FTBR="<tr><td class=\"left\">&nbsp;&nbsp;- unreproducible ones</a></td><td></td>"
-	local TD_PKG_STRETCH_FTBFS="<tr><td class=\"left\">&nbsp;&nbsp;- failing to build</a></td><td></td>"
-	local TD_PKG_STRETCH_ISSUES="<tr><td class=\"left\">packages in stretch which need to be fixed</td><td></td>"
+	local TD_PKG_BUSTER_NOISSUES="<tr><td class=\"left\">packages in buster with issues but without identified ones</td><td></td>"
+	local TD_PKG_BUSTER_FTBR="<tr><td class=\"left\">&nbsp;&nbsp;- unreproducible ones</a></td><td></td>"
+	local TD_PKG_BUSTER_FTBFS="<tr><td class=\"left\">&nbsp;&nbsp;- failing to build</a></td><td></td>"
+	local TD_PKG_BUSTER_ISSUES="<tr><td class=\"left\">packages in buster which need to be fixed</td><td></td>"
 	for ARCH in ${ARCHS} ; do
 		SUITE="unstable"
 		gather_suite_arch_stats
@@ -569,24 +570,24 @@ create_dashboard_page() {
 		RESULT=$(query_db "SELECT COUNT(*) FROM (SELECT s.id FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status='FTBFS' AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH') tmp")
 		TD_PKG_SID_FTBFS="$TD_PKG_SID_FTBFS<td>$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
 
-		SUITE="stretch"
+		SUITE="buster"
 		gather_suite_arch_stats
-		TD_PKG_STRETCH_ISSUES="$TD_PKG_STRETCH_ISSUES<td>$(echo $COUNT_BAD + $COUNT_UGLY |bc) / $(echo $PERCENT_BAD + $PERCENT_UGLY|bc)%</td>"
+		TD_PKG_BUSTER_ISSUES="$TD_PKG_BUSTER_ISSUES<td>$(echo $COUNT_BAD + $COUNT_UGLY |bc) / $(echo $PERCENT_BAD + $PERCENT_UGLY|bc)%</td>"
 		RESULT=$(query_db "SELECT COUNT(*) FROM (SELECT s.id FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status IN ('unreproducible', 'FTBFS', 'blacklisted') AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH') tmp")
-		TD_PKG_STRETCH_NOISSUES="$TD_PKG_STRETCH_NOISSUES<td><a href=\"/debian/$SUITE/$ARCH/index_no_notes.html\">$RESULT</a> / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
+		TD_PKG_BUSTER_NOISSUES="$TD_PKG_BUSTER_NOISSUES<td><a href=\"/debian/$SUITE/$ARCH/index_no_notes.html\">$RESULT</a> / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
 		RESULT=$(query_db "SELECT COUNT(*) FROM (SELECT s.id FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status='unreproducible' AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH') tmp")
-		TD_PKG_STRETCH_FTBR="$TD_PKG_STRETCH_FTBR<td>$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
+		TD_PKG_BUSTER_FTBR="$TD_PKG_BUSTER_FTBR<td>$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
 		RESULT=$(query_db "SELECT COUNT(*) FROM (SELECT s.id FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status='FTBFS' AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH') tmp")
-		TD_PKG_STRETCH_FTBFS="$TD_PKG_STRETCH_FTBFS<td>$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
+		TD_PKG_BUSTER_FTBFS="$TD_PKG_BUSTER_FTBFS<td>$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
 	done
 	write_page "$TD_PKG_SID_NOISSUES</tr>"
 	write_page "$TD_PKG_SID_FTBR</tr>"
 	write_page "$TD_PKG_SID_FTBFS</tr>"
 	write_page "$TD_PKG_SID_ISSUES</tr>"
-	write_page "$TD_PKG_STRETCH_NOISSUES</tr>"
-	write_page "$TD_PKG_STRETCH_FTBR</tr>"
-	write_page "$TD_PKG_STRETCH_FTBFS</tr>"
-	write_page "$TD_PKG_STRETCH_ISSUES</tr>"
+	write_page "$TD_PKG_BUSTER_NOISSUES</tr>"
+	write_page "$TD_PKG_BUSTER_FTBR</tr>"
+	write_page "$TD_PKG_BUSTER_FTBFS</tr>"
+	write_page "$TD_PKG_BUSTER_ISSUES</tr>"
 	ARCH="amd64"
 	SUITE="unstable"