[Git][qa/jenkins.debian.net][master] 3 commits: fixup²: rdn: add support for syncing several components

[Holger Levsen (@holger)]

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


Commits:
f8898ace by Holger Levsen at 2025-08-24T19:56:58+02:00
fixup²: rdn: add support for syncing several components

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

- - - - -
36544c76 by Jochen Sprickerhof at 2025-08-24T19:57:37+02:00
rdn: fix stats script

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

- - - - -
f9ddacb2 by Jochen Sprickerhof at 2025-08-24T19:57:41+02:00
rdn: adopt stats script to new DB design

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

- - - - -


2 changed files:

- bin/rebuilderd_pkgsync.sh
- bin/rebuilderd_stats.py


Changes:

=====================================
bin/rebuilderd_pkgsync.sh
=====================================
@@ -42,5 +42,5 @@ esac
 # FIXME set it here too until it's run by the service
 export REBUILDERD_COOKIE_PATH=/srv/rebuilderd/$ARCH/.auth-cookie
 for component in $COMPONENTS ; do
-	exec $REBUILDCTL -H http://127.0.0.1:$PORT pkgs sync-profile --sync-config "/etc/rebuilderd/rebuilderd-sync-${ARCH}.conf" debian-$component
+	$REBUILDCTL -H http://127.0.0.1:$PORT pkgs sync-profile --sync-config "/etc/rebuilderd/rebuilderd-sync-${ARCH}.conf" debian-$component
 done


=====================================
bin/rebuilderd_stats.py
=====================================
@@ -154,8 +154,13 @@ 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, r.build_log, a.diffoscope"
-            " FROM rebuild_artifacts a JOIN rebuilds r ON a.rebuild_id = r.id JOIN build_inputs i ON r.build_input_id = i.id JOIN source_packages s ON i.source_package_id = s.id"
+            "SELECT a.name, s.name, r.id, l.build_log, d.diffoscope"
+            " FROM rebuild_artifacts a"
+            " JOIN diffoscope_logs d ON a.diffoscope_log_id = d.id"
+            " JOIN rebuilds r ON a.rebuild_id = r.id"
+            " JOIN build_logs l ON r.build_log_id = l.id"
+            " JOIN build_inputs i ON r.build_input_id = i.id"
+            " JOIN source_packages s ON i.source_package_id = s.id"
             f" WHERE a.status = 'BAD' {filter_release} group by a.name HAVING r.id = MAX(r.id) ORDER BY a.id"
         )
         api = "v1"
@@ -199,12 +204,12 @@ def main() -> None:
 
     db_size = path.getsize(args.db)
     with (args.output_dir / "index.html").open("w") as outfile:
-        output(outfile, args.arch, db_size, total, messages_packages, False)
+        output(outfile, args.arch, db_size, total, messages_packages, False, api)
     with (args.output_dir / "index_size.html").open("w") as outfile:
-        output(outfile, args.arch, db_size, total, messages_packages, True)
+        output(outfile, args.arch, db_size, total, messages_packages, True, api)
 
 
-def output(outfile, arch, db_size, total, messages_packages, size_sort):
+def output(outfile, arch, db_size, total, messages_packages, size_sort, api):
     with urlopen("https://salsa.debian.org/reproducible-builds/reproducible-notes/-/raw/master/packages.yml?ref_type=heads") as rn:
         rn_bugs = safe_load(rn)
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/684439c0831df7fb556a3bb002d8d7e71e21ab7d...f9ddacb25616b3b6774efef3592c294e63f8d0cb

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/684439c0831df7fb556a3bb002d8d7e71e21ab7d...f9ddacb25616b3b6774efef3592c294e63f8d0cb
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/07033804/attachment-0001.htm>