[Git][qa/jenkins.debian.net][master] rdn stats: count source package by (pkg, ver)

[Holger Levsen (@holger)]

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


Commits:
58d73888 by Jochen Sprickerhof at 2026-04-14T14:21:41+02:00
rdn stats: count source package by (pkg, ver)

This aligns with the numbers from rebuilderd.

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

- - - - -


1 changed file:

- bin/rebuilderd_stats.py


Changes:

=====================================
bin/rebuilderd_stats.py
=====================================
@@ -156,7 +156,7 @@ def main() -> None:
 
     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_log, a.id"
+            "SELECT a.name, s.name, s.version, r.id, l.build_log, d.diffoscope_log, a.id"
             " FROM rebuild_artifacts a"
             " LEFT JOIN diffoscope_logs d ON a.diffoscope_log_id = d.id"
             " RIGHT JOIN rebuilds r ON a.rebuild_id = r.id"
@@ -170,13 +170,13 @@ def main() -> None:
         api = "../api/v1"
     else:
         sql = (
-            "SELECT p.name, s.name, p.build_id, b.build_log, b.diffoscope, NULL"
+            "SELECT p.name, s.name, s.version, p.build_id, b.build_log, b.diffoscope, NULL"
             " FROM packages p JOIN pkgbases s ON s.id = p.pkgbase_id LEFT JOIN builds b ON b.id = p.build_id"
             " WHERE p.status = 'BAD' ORDER BY p.build_id"
         )
         api = "api/v0"
 
-    for name, src_name, build_id, build_log, diffoscope, diffoscope_id in cu.execute(sql):
+    for name, src_name, src_version, build_id, build_log, diffoscope, diffoscope_id in cu.execute(sql):
         total += 1
 
         if not name:
@@ -185,7 +185,7 @@ def main() -> None:
         if build_id in cache:
             cache_new[build_id] = cache[build_id]
             message, difflen = cache[build_id]
-            messages_packages[message].append({"name": name, "src": src_name, "id": build_id, "diff": difflen, "diff_id": diffoscope_id})
+            messages_packages[message].append({"name": name, "src": src_name, "version": src_verison, "id": build_id, "diff": difflen, "diff_id": diffoscope_id})
             continue
 
         build_log = unzstd.stream_reader(build_log).read().decode("utf8", "replace")
@@ -245,7 +245,7 @@ def output(outfile, arch, db_size, total, messages_packages, size_sort, api, rel
             file=outfile
         )
         bad_packages += len(packages)
-        bad_sources += len(set([pkg['src'] for pkg in packages]))
+        bad_sources += len(set([f"{pkg['src']}_{pkg['version']}" for pkg in packages]))
     print(
         f'<tr><td><b>total amount of unreproduced packages</b></td>'
         f'<td style="text-align:right"><b>{bad_packages}</b></td>'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/58d73888ab01d0386d6825da4688f821936fdc37

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/58d73888ab01d0386d6825da4688f821936fdc37
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/20260414/2a2b58a1/attachment-0001.htm>