[Git][qa/jenkins.debian.net][master] 3 commits: Revert "rdn: move pull stats one level up"
Holger Levsen (@holger)
gitlab at salsa.debian.org
Mon Aug 25 08:25:03 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
b5ede687 by Jochen Sprickerhof at 2025-08-25T09:24:39+02:00
Revert "rdn: move pull stats one level up"
This reverts commit f20c8189696fff3140f3bb0e60e38d7e3d927674.
(cherry picked from commit 23da80d4e88146c21f0e3b67054de1ee8667012d)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
b1ad31d8 by Jochen Sprickerhof at 2025-08-25T09:24:43+02:00
rdn: fix v1 API URLs
(cherry picked from commit 97ea8333eaa2c1da4589ccf611cee42ca066cf50)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
b5b71b53 by Jochen Sprickerhof at 2025-08-25T09:24:49+02:00
rdn: make stats cache per release
(cherry picked from commit 49a64b3683e66a703f03394442467a520dc6e16a)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
8 changed files:
- bin/rebuilderd_stats.py
- hosts/osuosl5-amd64/etc/cron.d/rebuilderd
- hosts/osuosl5-amd64/var/www/html/amd64-pull184/forky.html
- hosts/osuosl5-amd64/var/www/html/amd64-pull184/trixie-proposed-updates.html
- hosts/osuosl5-amd64/var/www/html/amd64-pull184/trixie-security.html
- hosts/osuosl5-amd64/var/www/html/amd64-pull184/trixie-updates.html
- hosts/osuosl5-amd64/var/www/html/amd64-pull184/trixie.html
- hosts/osuosl5-amd64/var/www/html/amd64-pull184/unstable.html
Changes:
=====================================
bin/rebuilderd_stats.py
=====================================
@@ -163,14 +163,14 @@ def main() -> None:
" 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"
+ api = "../api/v1"
else:
sql = (
"SELECT p.name, s.name, p.build_id, b.build_log, b.diffoscope"
" 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 = "v0"
+ api = "api/v0"
for name, src_name, build_id, build_log, diffoscope in cu.execute(sql):
total += 1
@@ -274,9 +274,9 @@ def output(outfile, arch, db_size, total, messages_packages, size_sort, api):
if not bug_break and not (pkg["src"] in rn_bugs and "bugs" in rn_bugs[pkg["src"]]):
bug_break = True
print("</span></p><p><span>", file=outfile)
- print(f'<a href="../api/{api}/builds/{pkg["id"]}/log">{pkg["name"]}</a> ', end='', file=outfile)
+ print(f'<a href="../{api}/builds/{pkg["id"]}/log">{pkg["name"]}</a> ', end='', file=outfile)
if pkg["diff"]:
- print(f'<a href="../api/{api}/builds/{pkg["id"]}/diffoscope">💠</a>', end='', file=outfile)
+ print(f'<a href="../{api}/builds/{pkg["id"]}/diffoscope">💠</a>', end='', file=outfile)
print(f'<a href="https://tracker.debian.org/pkg/{pkg["src"]}">🍥</a>', end='', file=outfile)
print(f'<a href="https://tests.reproducible-builds.org/debian/rb-pkg/trixie/{ci_arch}/{pkg["src"]}.html">🔬</a>', end='', file=outfile)
if pkg["src"] in rn_bugs and "bugs" in rn_bugs[pkg["src"]]:
=====================================
hosts/osuosl5-amd64/etc/cron.d/rebuilderd
=====================================
@@ -1,5 +1,5 @@
MAILTO=root
42 */3 * * * rebuilderd for arch in all amd64 arm64 armel armhf i386 ppc64el riscv64 ; do mkdir -p /srv/rebuilderd/$arch/stats/ && /srv/jenkins/bin/rebuilderd_stats.py $arch /srv/rebuilderd/$arch/rebuilderd.db --cache /srv/rebuilderd/$arch/stats/cache.pickle /srv/rebuilderd/$arch/stats/ ; done
-0 */3 * * * rebuilderd for arch in amd64-pull184 ; do for release in trixie trixie-proposed-updates trixie-updates trixie-security forky unstable ; do mkdir -p /srv/rebuilderd/$arch/stats_$release && /srv/jenkins/bin/rebuilderd_stats.py --release $release $arch /srv/rebuilderd/$arch/rebuilderd.db --cache /srv/rebuilderd/$arch/stats_$release/cache.pickle /srv/rebuilderd/$arch/stats_$release ; /srv/jenkins/bin/rebuilderd_graph.sh $arch $release ; done ; done
+0 */3 * * * rebuilderd for arch in amd64-pull184 ; do for release in trixie trixie-proposed-updates trixie-updates trixie-security forky unstable ; do mkdir -p /srv/rebuilderd/$arch/stats/$release && /srv/jenkins/bin/rebuilderd_stats.py --release $release $arch /srv/rebuilderd/$arch/rebuilderd.db --cache /srv/rebuilderd/$arch/stats/$release/cache.pickle /srv/rebuilderd/$arch/stats/$release ; /srv/jenkins/bin/rebuilderd_graph.sh $arch $release ; done ; done
23 0,6,12,18 * * * rebuilderd for arch in all amd64 arm64 armel armhf i386 ppc64el riscv64 ; do /srv/jenkins/bin/rebuilderd_graph.sh $arch ; done
=====================================
hosts/osuosl5-amd64/var/www/html/amd64-pull184/forky.html
=====================================
@@ -218,7 +218,7 @@
<footer>
<br/>
- <a href="stats_forky">Statistics about BAD packages</a> on amd64/forky.
+ <a href="stats/forky">Statistics about BAD packages</a> on amd64/forky.
<br/>
<hr/>
pew pew, <a href="https://github.com/kpcyrd/rebuilderd">rebuilderd</a> using <a href="https://tracker.debian.org/pkg/devscripts">debrebuild</a> to reproduce what Debian distributes via <code><a href="https://ftp.debian.org/debian/dists/">ftp.debian.org</a></code>. ♥️
=====================================
hosts/osuosl5-amd64/var/www/html/amd64-pull184/trixie-proposed-updates.html
=====================================
@@ -218,7 +218,7 @@
<footer>
<br/>
- <a href="stats_trixie-proposed-updates">Statistics about BAD packages</a> on amd64/trixie-proposed-updates.
+ <a href="stats/trixie-proposed-updates">Statistics about BAD packages</a> on amd64/trixie-proposed-updates.
<br/>
<hr/>
pew pew, <a href="https://github.com/kpcyrd/rebuilderd">rebuilderd</a> using <a href="https://tracker.debian.org/pkg/devscripts">debrebuild</a> to reproduce what Debian distributes via <code><a href="https://ftp.debian.org/debian/dists/">ftp.debian.org</a></code>. ♥️
=====================================
hosts/osuosl5-amd64/var/www/html/amd64-pull184/trixie-security.html
=====================================
@@ -218,7 +218,7 @@
<footer>
<br/>
- <a href="stats_trixie-security">Statistics about BAD packages</a> on amd64/trixie-security.
+ <a href="stats/trixie-security">Statistics about BAD packages</a> on amd64/trixie-security.
<br/>
<hr/>
pew pew, <a href="https://github.com/kpcyrd/rebuilderd">rebuilderd</a> using <a href="https://tracker.debian.org/pkg/devscripts">debrebuild</a> to reproduce what Debian distributes via <code><a href="https://ftp.debian.org/debian/dists/">ftp.debian.org</a></code>. ♥️
=====================================
hosts/osuosl5-amd64/var/www/html/amd64-pull184/trixie-updates.html
=====================================
@@ -218,7 +218,7 @@
<footer>
<br/>
- <a href="stats_trixie-updates">Statistics about BAD packages</a> on amd64/trixie-updates.
+ <a href="stats/trixie-updates">Statistics about BAD packages</a> on amd64/trixie-updates.
<br/>
<hr/>
pew pew, <a href="https://github.com/kpcyrd/rebuilderd">rebuilderd</a> using <a href="https://tracker.debian.org/pkg/devscripts">debrebuild</a> to reproduce what Debian distributes via <code><a href="https://ftp.debian.org/debian/dists/">ftp.debian.org</a></code>. ♥️
=====================================
hosts/osuosl5-amd64/var/www/html/amd64-pull184/trixie.html
=====================================
@@ -218,7 +218,7 @@
<footer>
<br/>
- <a href="stats_trixie">Statistics about BAD packages</a> on amd64/trixie.
+ <a href="stats/trixie">Statistics about BAD packages</a> on amd64/trixie.
<br/>
<hr/>
pew pew, <a href="https://github.com/kpcyrd/rebuilderd">rebuilderd</a> using <a href="https://tracker.debian.org/pkg/devscripts">debrebuild</a> to reproduce what Debian distributes via <code><a href="https://ftp.debian.org/debian/dists/">ftp.debian.org</a></code>. ♥️
=====================================
hosts/osuosl5-amd64/var/www/html/amd64-pull184/unstable.html
=====================================
@@ -218,7 +218,7 @@
<footer>
<br/>
- <a href="stats_unstable">Statistics about BAD packages</a> on amd64/unstable.
+ <a href="stats/unstable">Statistics about BAD packages</a> on amd64/unstable.
<br/>
<hr/>
pew pew, <a href="https://github.com/kpcyrd/rebuilderd">rebuilderd</a> using <a href="https://tracker.debian.org/pkg/devscripts">debrebuild</a> to reproduce what Debian distributes via <code><a href="https://ftp.debian.org/debian/dists/">ftp.debian.org</a></code>. ♥️
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/0ba10290c3887ccf0624ce069b88fc2fac01311f...b5b71b53d9911a413c403152d6dde13eef7ff7e8
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/0ba10290c3887ccf0624ce069b88fc2fac01311f...b5b71b53d9911a413c403152d6dde13eef7ff7e8
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/20250825/a0b53d01/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list