[Git][qa/jenkins.debian.net][master] 2 commits: rdn stats: fix variable names
Holger Levsen (@holger)
gitlab at salsa.debian.org
Tue Apr 14 21:26:14 BST 2026
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
b02481d1 by Jochen Sprickerhof at 2026-04-14T22:25:14+02:00
rdn stats: fix variable names
Fixup for 58d73888ab01d0386d6825da4688f821936fdc37
(cherry picked from commit 44ce6b89193f3fbe585e38ed7c8702be27ca1201)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
c8b5a297 by Jochen Sprickerhof at 2026-04-14T22:25:46+02:00
rdn: update sync profiles for rebuilderd #228 and #229
(cherry picked from commit ac12230823cd6fe81998e4cd07b46bfeeaefd541)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
10 changed files:
- bin/rebuilderd_pkgsync.sh
- bin/rebuilderd_stats.py
- hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-all.conf
- hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-amd64.conf
- hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-arm64.conf
- hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-armel.conf
- hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-armhf.conf
- hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-i386.conf
- hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-ppc64el.conf
- hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-riscv64.conf
Changes:
=====================================
bin/rebuilderd_pkgsync.sh
=====================================
@@ -8,7 +8,6 @@ set -o pipefail # see eg http://petereisentraut.blogspot.com/2010/11/pipefail.h
ARCH=$1
REBUILDCTL=/usr/local/usr/bin/rebuildctl
-PROFILES="main security"
#
# choose correct port
#
@@ -16,7 +15,6 @@ case $ARCH in
all) PORT=8489
;;
amd64) PORT=8484
- PROFILES="main main-debug security"
;;
arm64) PORT=8486
;;
@@ -38,6 +36,4 @@ esac
# REBUILDERD_COOKIE_PATH is be set by service
# FIXME set it here too until it's run by the service
export REBUILDERD_COOKIE_PATH=/srv/rebuilderd/$ARCH/.auth-cookie
-for profile in $PROFILES ; do
- $REBUILDCTL -H http://127.0.0.1:$PORT pkgs sync-profile --sync-config "/etc/rebuilderd/rebuilderd-sync-${ARCH}.conf" debian-$profile
-done
+$REBUILDCTL -H http://127.0.0.1:$PORT pkgs sync-profile --sync-config "/etc/rebuilderd/rebuilderd-sync-${ARCH}.conf" debian
=====================================
bin/rebuilderd_stats.py
=====================================
@@ -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, "version": src_verison, "id": build_id, "diff": difflen, "diff_id": diffoscope_id})
+ messages_packages[message].append({"name": name, "src": src_name, "version": src_version, "id": build_id, "diff": difflen, "diff_id": diffoscope_id})
continue
build_log = unzstd.stream_reader(build_log).read().decode("utf8", "replace")
@@ -198,7 +198,7 @@ def main() -> None:
if error_match_fn(build_log, diffoscope):
difflen = len(diffoscope.splitlines())
cache_new[build_id] = (message, difflen)
- 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_version, "id": build_id, "diff": difflen, "diff_id": diffoscope_id})
break
messages_packages = {k: v for k, v in messages_packages.items() if v} # Remove empty categories
@@ -234,22 +234,24 @@ def output(outfile, arch, db_size, total, messages_packages, size_sort, api, rel
print(f"Last changed: {datetime.now().replace(microsecond=0)} - updated every 3h.", file=outfile)
print("<table> <tr> <th>error</th> <th colspan=2>number of affected<br/>bad binary packages</th><th>number of affected<br/>bad source packages</th> </tr>", file=outfile)
- bad_packages=0
- bad_sources=0
+ sum_bad_packages=0
+ sum_bad_sources=0
for message, packages in messages_packages.items():
anchor = message.replace(" ", "-")
+ bad_packages = len(packages)
+ bad_sources = len(set([f"{pkg['src']}_{pkg['version']}" for pkg in packages]))
+ sum_bad_packages += bad_packages
+ sum_bad_sources += bad_sources
print(
f'<tr><td><a href="#{anchor}">{message}</a></td>'
- f'<td style="text-align:right">{len(packages)}</td><td style="text-align:right">({len(packages)/total*100:.2f}%)</td>'
- f'<td style="text-align:right">{len(set([pkg['src'] for pkg in packages]))}</td></tr>',
+ f'<td style="text-align:right">{bad_packages}</td><td style="text-align:right">({bad_packages/total*100:.2f}%)</td>'
+ f'<td style="text-align:right">{bad_sources}</td></tr>',
file=outfile
)
- bad_packages += len(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>'
- f'<td style="text-align:right" colspan="2"><b>{bad_sources}</b></td></tr>',
+ f'<td style="text-align:right"><b>{sum_bad_packages}</b></td>'
+ f'<td style="text-align:right" colspan="2"><b>{sum_bad_sources}</b></td></tr>',
file=outfile
)
print("</table>", file=outfile)
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-all.conf
=====================================
@@ -1,15 +1,22 @@
-[profile."debian-main"]
+[profile."debian"]
distro = "debian"
-components = [ "main", "non-free-firmware" ]
+components = [ "main", "non-free-firmware", "main/debian-installer" ]
architectures = ["all"]
-releases = ["trixie", "trixie-backports", "trixie-proposed-updates", "trixie-updates", "forky", "unstable", "experimental"]
+releases = [
+ "trixie",
+ "trixie-backports",
+ "trixie-proposed-updates",
+ "trixie-updates",
+ "forky",
+ "unstable",
+ "experimental",
+ { name = "trixie-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-backports-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-proposed-updates-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "forky-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "unstable-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "experimental-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-security", source = "http://security.debian.org/" }
+]
source = "http://deb.debian.org/debian"
#excludes = ["tensorflow*"]
-
-[profile."debian-security"]
-distro = "debian"
-components = [ "main", "non-free-firmware" ]
-architectures = ["all"]
-releases = ["trixie-security"]
-source = "http://security.debian.org/"
-
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-amd64.conf
=====================================
@@ -1,22 +1,22 @@
-[profile."debian-main"]
+[profile."debian"]
distro = "debian"
-components = [ "main", "non-free-firmware" ]
+components = [ "main", "non-free-firmware", "main/debian-installer" ]
architectures = ["amd64"]
-releases = ["trixie", "trixie-backports", "trixie-proposed-updates", "trixie-updates", "forky", "unstable", "experimental"]
+releases = [
+ "trixie",
+ "trixie-backports",
+ "trixie-proposed-updates",
+ "trixie-updates",
+ "forky",
+ "unstable",
+ "experimental",
+ { name = "trixie-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-backports-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-proposed-updates-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "forky-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "unstable-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "experimental-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-security", source = "http://security.debian.org/" }
+]
source = "http://deb.debian.org/debian"
#excludes = ["tensorflow*"]
-
-[profile."debian-main-debug"]
-distro = "debian"
-components = [ "main" ]
-architectures = ["amd64"]
-releases = ["trixie-backports-debug"]
-source = "http://deb.debian.org/debian-debug"
-
-[profile."debian-security"]
-distro = "debian"
-components = [ "main", "non-free-firmware" ]
-architectures = ["amd64"]
-releases = ["trixie-security"]
-source = "http://security.debian.org/"
-
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-arm64.conf
=====================================
@@ -1,15 +1,22 @@
-[profile."debian-main"]
+[profile."debian"]
distro = "debian"
-components = [ "main", "non-free-firmware" ]
+components = [ "main", "non-free-firmware", "main/debian-installer" ]
architectures = ["arm64"]
-releases = ["trixie", "trixie-backports", "trixie-proposed-updates", "trixie-updates", "forky", "unstable", "experimental"]
+releases = [
+ "trixie",
+ "trixie-backports",
+ "trixie-proposed-updates",
+ "trixie-updates",
+ "forky",
+ "unstable",
+ "experimental",
+ { name = "trixie-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-backports-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-proposed-updates-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "forky-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "unstable-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "experimental-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-security", source = "http://security.debian.org/" }
+]
source = "http://deb.debian.org/debian"
#excludes = ["tensorflow*"]
-
-[profile."debian-security"]
-distro = "debian"
-components = [ "main", "non-free-firmware" ]
-architectures = ["arm64"]
-releases = ["trixie-security"]
-source = "http://security.debian.org/"
-
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-armel.conf
=====================================
@@ -1,15 +1,16 @@
-[profile."debian-main"]
+[profile."debian"]
distro = "debian"
-components = [ "main", "non-free-firmware" ]
+components = [ "main", "non-free-firmware", "main/debian-installer" ]
architectures = ["armel"]
-releases = ["trixie", "trixie-backports", "trixie-proposed-updates", "trixie-updates"]
+releases = [
+ "trixie",
+ "trixie-backports",
+ "trixie-proposed-updates",
+ "trixie-updates",
+ { name = "trixie-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-backports-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-proposed-updates-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-security", source = "http://security.debian.org/" }
+]
source = "http://deb.debian.org/debian"
#excludes = ["tensorflow*"]
-
-[profile."debian-security"]
-distro = "debian"
-components = [ "main", "non-free-firmware" ]
-architectures = ["armel"]
-releases = ["trixie-security"]
-source = "http://security.debian.org/"
-
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-armhf.conf
=====================================
@@ -1,15 +1,22 @@
-[profile."debian-main"]
+[profile."debian"]
distro = "debian"
-components = [ "main", "non-free-firmware" ]
+components = [ "main", "non-free-firmware", "main/debian-installer" ]
architectures = ["armhf"]
-releases = ["trixie", "trixie-backports", "trixie-proposed-updates", "trixie-updates", "forky", "unstable", "experimental"]
+releases = [
+ "trixie",
+ "trixie-backports",
+ "trixie-proposed-updates",
+ "trixie-updates",
+ "forky",
+ "unstable",
+ "experimental",
+ { name = "trixie-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-backports-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-proposed-updates-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "forky-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "unstable-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "experimental-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-security", source = "http://security.debian.org/" }
+]
source = "http://deb.debian.org/debian"
#excludes = ["tensorflow*"]
-
-[profile."debian-security"]
-distro = "debian"
-components = [ "main", "non-free-firmware" ]
-architectures = ["armhf"]
-releases = ["trixie-security"]
-source = "http://security.debian.org/"
-
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-i386.conf
=====================================
@@ -1,15 +1,22 @@
-[profile."debian-main"]
+[profile."debian"]
distro = "debian"
-components = [ "main", "non-free-firmware" ]
+components = [ "main", "non-free-firmware", "main/debian-installer" ]
architectures = ["i386"]
-releases = ["trixie", "trixie-backports", "trixie-proposed-updates", "trixie-updates", "forky", "unstable", "experimental"]
+releases = [
+ "trixie",
+ "trixie-backports",
+ "trixie-proposed-updates",
+ "trixie-updates",
+ "forky",
+ "unstable",
+ "experimental",
+ { name = "trixie-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-backports-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-proposed-updates-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "forky-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "unstable-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "experimental-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-security", source = "http://security.debian.org/" }
+]
source = "http://deb.debian.org/debian"
#excludes = ["tensorflow*"]
-
-[profile."debian-security"]
-distro = "debian"
-components = [ "main", "non-free-firmware" ]
-architectures = ["i386"]
-releases = ["trixie-security"]
-source = "http://security.debian.org/"
-
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-ppc64el.conf
=====================================
@@ -1,15 +1,22 @@
-[profile."debian-main"]
+[profile."debian"]
distro = "debian"
-components = [ "main", "non-free-firmware" ]
+components = [ "main", "non-free-firmware", "main/debian-installer" ]
architectures = ["ppc64el"]
-releases = ["trixie", "trixie-backports", "trixie-proposed-updates", "trixie-updates", "forky", "unstable", "experimental"]
+releases = [
+ "trixie",
+ "trixie-backports",
+ "trixie-proposed-updates",
+ "trixie-updates",
+ "forky",
+ "unstable",
+ "experimental",
+ { name = "trixie-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-backports-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-proposed-updates-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "forky-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "unstable-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "experimental-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-security", source = "http://security.debian.org/" }
+]
source = "http://deb.debian.org/debian"
#excludes = ["tensorflow*"]
-
-[profile."debian-security"]
-distro = "debian"
-components = [ "main", "non-free-firmware" ]
-architectures = ["ppc64el"]
-releases = ["trixie-security"]
-source = "http://security.debian.org/"
-
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-riscv64.conf
=====================================
@@ -1,15 +1,22 @@
-[profile."debian-main"]
+[profile."debian"]
distro = "debian"
-components = [ "main", "non-free-firmware" ]
+components = [ "main", "non-free-firmware", "main/debian-installer" ]
architectures = ["riscv64"]
-releases = ["trixie", "trixie-backports", "trixie-proposed-updates", "trixie-updates", "forky", "unstable", "experimental"]
+releases = [
+ "trixie",
+ "trixie-backports",
+ "trixie-proposed-updates",
+ "trixie-updates",
+ "forky",
+ "unstable",
+ "experimental",
+ { name = "trixie-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-backports-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-proposed-updates-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "forky-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "unstable-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "experimental-debug", source = "http://deb.debian.org/debian-debug" },
+ { name = "trixie-security", source = "http://security.debian.org/" }
+]
source = "http://deb.debian.org/debian"
#excludes = ["tensorflow*"]
-
-[profile."debian-security"]
-distro = "debian"
-components = [ "main", "non-free-firmware" ]
-architectures = ["riscv64"]
-releases = ["trixie-security"]
-source = "http://security.debian.org/"
-
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/58d73888ab01d0386d6825da4688f821936fdc37...c8b5a2975df69a081c15dfcb5d8387fe37088658
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/58d73888ab01d0386d6825da4688f821936fdc37...c8b5a2975df69a081c15dfcb5d8387fe37088658
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/cee88475/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list