[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible debian: also use bc_round in a different table in the

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
25691e9e by Mattia Rizzolo at 2022-10-09T15:22:12+02:00
reproducible debian: also use bc_round in a different table in the
dashboard

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
b410b49e by Mattia Rizzolo at 2022-10-09T15:22:30+02:00
reproducible debian: fix bc syntax in the computation of the percentage of FTBR packages in the dashboard

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


1 changed file:

- bin/reproducible_html_dashboard.sh


Changes:

=====================================
bin/reproducible_html_dashboard.sh
=====================================
@@ -208,7 +208,7 @@ gather_suite_arch_stats() {
 	COUNT_OTHER=$(( $COUNT_SOURCELESS+$COUNT_NOTFORUS+$COUNT_BLACKLISTED+$COUNT_DEPWAIT+$COUNT_TIMEOUT ))
 	PERCENT_TOTAL=$(bc_round "($COUNT_TOTAL*100/$AMOUNT)")
 	PERCENT_GOOD=$(bc_round "($COUNT_GOOD*100/$COUNT_TOTAL)" || echo 0)
-	PERCENT_BAD=$(bc_round "$COUNT_BAD*100/$COUNT_TOTAL)" || echo 0)
+	PERCENT_BAD=$(bc_round "($COUNT_BAD*100/$COUNT_TOTAL)" || echo 0)
 	PERCENT_UGLY=$(bc_round "($COUNT_UGLY*100/$COUNT_TOTAL)" || echo 0)
 	PERCENT_TIMEOUT=$(bc_round "($COUNT_TIMEOUT*100/$COUNT_TOTAL)" || echo 0)
 	PERCENT_NOTFORUS=$(bc_round "($COUNT_NOTFORUS*100/$COUNT_TOTAL)" || echo 0)
@@ -610,11 +610,11 @@ create_dashboard_page() {
 		TD_PKG_SID_ISSUES="$TD_PKG_SID_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 ('FTBR', 'FTBFS', 'blacklisted') AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH') tmp")
-		TD_PKG_SID_NOISSUES="$TD_PKG_SID_NOISSUES<td><a href=\"/debian/$SUITE/$ARCH/index_no_notes.html\">$RESULT</a> / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
+		TD_PKG_SID_NOISSUES="$TD_PKG_SID_NOISSUES<td><a href=\"/debian/$SUITE/$ARCH/index_no_notes.html\">$RESULT</a> / $(bc_round "($RESULT*100/$COUNT_TOTAL)")%</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='FTBR' AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH') tmp")
-		TD_PKG_SID_FTBR="$TD_PKG_SID_FTBR<td>$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
+		TD_PKG_SID_FTBR="$TD_PKG_SID_FTBR<td>$RESULT / $(bc_round "($RESULT*100/$COUNT_TOTAL)")%</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_SID_FTBFS="$TD_PKG_SID_FTBFS<td>$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
+		TD_PKG_SID_FTBFS="$TD_PKG_SID_FTBFS<td>$RESULT / $(bc_round "($RESULT*100/$COUNT_TOTAL)")%</td>"
 		# define next stable release here:
 		SUITE="bookworm"
 		gather_suite_arch_stats
@@ -622,9 +622,9 @@ 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 IN ('FTBR', 'FTBFS', 'blacklisted') AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH') tmp")
 		TD_PKG_TESTING_NOISSUES="$TD_PKG_TESTING_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='FTBR' AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH') tmp")
-		TD_PKG_TESTING_FTBR="$TD_PKG_TESTING_FTBR<td>$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
+		TD_PKG_TESTING_FTBR="$TD_PKG_TESTING_FTBR<td>$RESULT / $(bc_round "($RESULT*100/$COUNT_TOTAL)")%</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_TESTING_FTBFS="$TD_PKG_TESTING_FTBFS<td>$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)%</td>"
+		TD_PKG_TESTING_FTBFS="$TD_PKG_TESTING_FTBFS<td>$RESULT / $(bc_round "($RESULT*100/$COUNT_TOTAL)")%</td>"
 	done
 	write_page "$TD_PKG_SID_NOISSUES</tr>"
 	write_page "$TD_PKG_SID_FTBR</tr>"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/5efaac250de1de114166aa40e99e33f803edd122...b410b49e9f294c6b35f413e5179b00f62c443ff9

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/5efaac250de1de114166aa40e99e33f803edd122...b410b49e9f294c6b35f413e5179b00f62c443ff9
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/20221009/0e4e2958/attachment-0001.htm>