[Git][qa/jenkins.debian.net][master] 2 commits: rdn: refactoring

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
d69bcde8 by Holger Levsen at 2025-08-24T20:31:23+02:00
rdn: refactoring

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

- - - - -
4feb5360 by Jochen Sprickerhof at 2025-08-24T20:38:49+02:00
rdn: fix SQL

(cherry picked from commit a8f48cd802189558e346a49bee5ff88c7a5bcd07)
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/rebuilderd_graph.sh
- bin/rebuilderd_stats.py


Changes:

=====================================
bin/rebuilderd_graph.sh
=====================================
@@ -24,33 +24,42 @@ touch -d "$(date '+%Y-%m-%d') 00:00 UTC" $DUMMY_FILE
 #
 # init .csv file if needed
 #
-if [ ! -f $CSV ] ; then
-	echo "; date, good, unknown, bad" > $CSV
-fi
+init_csv() {
+	if [ ! -f $CSV ] ; then
+		echo "; date, good, unknown, bad" > $CSV
+	fi
+}
+init_csv
 
 #
 # update .csv if needed
 #
-if ! grep -q $TODAY $CSV ; then
-	GOOD=$(echo "SELECT count(*) FROM packages WHERE status='GOOD'" | sqlite3 $DB)
-	BAD=$(echo "SELECT count(*) FROM packages WHERE status='BAD'" | sqlite3 $DB)
-	UNKNOWN=$(echo "SELECT count(*) FROM packages WHERE status!='BAD' AND status!='GOOD'" | sqlite3 $DB)
-	echo "$TODAY, $GOOD, $UNKNOWN, $BAD" >> $CSV
-fi
+update_csv_api0() {
+	if ! grep -q $TODAY $CSV ; then
+		GOOD=$(echo "SELECT count(*) FROM packages WHERE status='GOOD'" | sqlite3 $DB)
+		BAD=$(echo "SELECT count(*) FROM packages WHERE status='BAD'" | sqlite3 $DB)
+		UNKNOWN=$(echo "SELECT count(*) FROM packages WHERE status!='BAD' AND status!='GOOD'" | sqlite3 $DB)
+		echo "$TODAY, $GOOD, $UNKNOWN, $BAD" >> $CSV
+	fi
+}
+update_csv_api0
 
 #
 # update png if needed
 #
-if [ ! -f $PNG ] || [ $DUMMY_FILE -nt $PNG ] ; then
-	XLABEL="reproduced arch:$ARCH packages in trixie"
-	GOOD=$(tail -1 $CSV | tr -d , | cut -d ' ' -f2)
-	BAD=$(tail -1 $CSV | tr -d , | cut -d ' ' -f4)
-	PERCENTAGE=$(echo "(100*$GOOD)/($GOOD+$BAD)"|bc)
-	YLABEL="pew pew, $PERCENTAGE%!"
-	WIDTH=1920
-	HEIGHT=1080
-	/srv/jenkins/bin/make_graph.py $CSV $PNG 3 "$XLABEL" "$YLABEL" $WIDTH $HEIGHT
-fi
+update_png_api0() {
+	if [ ! -f $PNG ] || [ $DUMMY_FILE -nt $PNG ] ; then
+		XLABEL="reproduced arch:$ARCH packages in trixie"
+		GOOD=$(tail -1 $CSV | tr -d , | cut -d ' ' -f2)
+		BAD=$(tail -1 $CSV | tr -d , | cut -d ' ' -f4)
+		PERCENTAGE=$(echo "(100*$GOOD)/($GOOD+$BAD)"|bc)
+		YLABEL="pew pew, $PERCENTAGE%!"
+		WIDTH=1920
+		HEIGHT=1080
+		/srv/jenkins/bin/make_graph.py $CSV $PNG 3 "$XLABEL" "$YLABEL" $WIDTH $HEIGHT
+	fi
+}
+update_png_api0
 
 #
 # cleanup


=====================================
bin/rebuilderd_stats.py
=====================================
@@ -154,7 +154,7 @@ def main() -> None:
         filter_release = f"AND s.release = {args.release}"
     if cu.execute("SELECT COUNT(name) FROM sqlite_schema WHERE name = 'rebuild_artifacts'").fetchall()[0][0] == 1:
         sql = (
-            "SELECT a.name, s.name, r.id, l.build_log, d.diffoscope"
+            "SELECT a.name, s.name, r.id, l.build_log, d.diffoscope_log"
             " FROM rebuild_artifacts a"
             " JOIN diffoscope_logs d ON a.diffoscope_log_id = d.id"
             " JOIN rebuilds r ON a.rebuild_id = r.id"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/6865674efe0b7cac72e160bba33ba602fa668719...4feb53605d0f1c4e7a8828697a63c14fb10b6518

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/6865674efe0b7cac72e160bba33ba602fa668719...4feb53605d0f1c4e7a8828697a63c14fb10b6518
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/20250824/80ad6f83/attachment-0001.htm>