From 5fa1dfef7776b08bd34a1b4ab74e85a8cea51e62 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 19 Jun 2017 14:25:45 +0200 Subject: reproducible Debian: show stats related to buster (instead of stretch) in the dashboard Signed-off-by: Holger Levsen --- TODO4buster.txt | 1 - bin/reproducible_html_dashboard.sh | 31 ++++++++++++++++--------------- 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 " $ARCH" done - write_page "oldest build result in stretch / unstable / experimental" + write_page "oldest build result in stretch / buster / unstable / experimental" 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 "$AGE_STRETCH / $AGE_UNSTABLE / $AGE_EXPERIMENTAL days" + 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 "$AGE_STRETCH / $AGE_BUSTER / $AGE_UNSTABLE / $AGE_EXPERIMENTAL days" done write_page "Build jobs configured" for ARCH in ${ARCHS} ; do @@ -553,10 +554,10 @@ create_dashboard_page() { local TD_PKG_SID_FTBR="  - unreproducible ones" local TD_PKG_SID_FTBFS="  - failing to build" local TD_PKG_SID_ISSUES="packages in unstable which need to be fixed" - local TD_PKG_STRETCH_NOISSUES="packages in stretch with issues but without identified ones" - local TD_PKG_STRETCH_FTBR="  - unreproducible ones" - local TD_PKG_STRETCH_FTBFS="  - failing to build" - local TD_PKG_STRETCH_ISSUES="packages in stretch which need to be fixed" + local TD_PKG_BUSTER_NOISSUES="packages in buster with issues but without identified ones" + local TD_PKG_BUSTER_FTBR="  - unreproducible ones" + local TD_PKG_BUSTER_FTBFS="  - failing to build" + local TD_PKG_BUSTER_ISSUES="packages in buster which need to be fixed" 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$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%" - SUITE="stretch" + SUITE="buster" gather_suite_arch_stats - TD_PKG_STRETCH_ISSUES="$TD_PKG_STRETCH_ISSUES$(echo $COUNT_BAD + $COUNT_UGLY |bc) / $(echo $PERCENT_BAD + $PERCENT_UGLY|bc)%" + TD_PKG_BUSTER_ISSUES="$TD_PKG_BUSTER_ISSUES$(echo $COUNT_BAD + $COUNT_UGLY |bc) / $(echo $PERCENT_BAD + $PERCENT_UGLY|bc)%" 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$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%" + TD_PKG_BUSTER_NOISSUES="$TD_PKG_BUSTER_NOISSUES$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%" 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$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%" + TD_PKG_BUSTER_FTBR="$TD_PKG_BUSTER_FTBR$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%" 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$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%" + TD_PKG_BUSTER_FTBFS="$TD_PKG_BUSTER_FTBFS$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%" done write_page "$TD_PKG_SID_NOISSUES" write_page "$TD_PKG_SID_FTBR" write_page "$TD_PKG_SID_FTBFS" write_page "$TD_PKG_SID_ISSUES" - write_page "$TD_PKG_STRETCH_NOISSUES" - write_page "$TD_PKG_STRETCH_FTBR" - write_page "$TD_PKG_STRETCH_FTBFS" - write_page "$TD_PKG_STRETCH_ISSUES" + write_page "$TD_PKG_BUSTER_NOISSUES" + write_page "$TD_PKG_BUSTER_FTBR" + write_page "$TD_PKG_BUSTER_FTBFS" + write_page "$TD_PKG_BUSTER_ISSUES" ARCH="amd64" SUITE="unstable" -- cgit v1.2.3-70-g09d2