[Git][qa/jenkins.debian.net][master] rdn: merge arm64 and armhf db+services into new arm one
Holger Levsen (@holger)
gitlab at salsa.debian.org
Wed Sep 16 19:02:18 BST 2026
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
f14c2d5e by Jochen Sprickerhof at 2026-09-16T20:01:42+02:00
rdn: merge arm64 and armhf db+services into new arm one
(cherry picked from commit 55c95df6f0d5be7e5f55c81733ffa62566f45ab4)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
9 changed files:
- bin/djm-rebuildctlwatch
- bin/rebuilderd_manual_scheduler.sh
- bin/rebuilderd_pkgsync.sh
- hosts/osuosl5-amd64/etc/nginx/nginx.conf
- hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-arm64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-arm.conf
- − hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-armhf.conf
- hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-arm64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-arm.conf
- − hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-armhf.conf
- update_jdn.sh
Changes:
=====================================
bin/djm-rebuildctlwatch
=====================================
@@ -24,7 +24,7 @@ set_globals_for_arch() {
amd64) PORT=8484 ;;
arm64) PORT=8486 ;;
armel) PORT=8491 ;;
- armhf) PORT=8487 ;;
+ armhf) PORT=8486 ;;
i386) PORT=8485 ;;
loong64) PORT=8492 ;;
ppc64el) PORT=8490 ;;
=====================================
bin/rebuilderd_manual_scheduler.sh
=====================================
@@ -28,7 +28,7 @@ case $ARCH in
;;
armel) PORT=8491
;;
- armhf) PORT=8487
+ armhf) PORT=8486
;;
i386) PORT=8485
;;
=====================================
bin/rebuilderd_pkgsync.sh
=====================================
@@ -16,12 +16,10 @@ case $ARCH in
;;
amd64) PORT=8484
;;
- arm64) PORT=8486
+ arm) PORT=8486
;;
armel) PORT=8491
;;
- armhf) PORT=8487
- ;;
i386) PORT=8485
;;
loong64) PORT=8492
=====================================
hosts/osuosl5-amd64/etc/nginx/nginx.conf
=====================================
@@ -99,7 +99,7 @@ http {
proxy_pass http://127.0.0.1:8486/api/v1/builds;
}
location /arm64/stats/ {
- alias /srv/rebuilderd/arm64/stats/ ;
+ alias /srv/rebuilderd/arm/stats/ ;
disable_symlinks off;
}
# armel
@@ -119,15 +119,15 @@ http {
# armhf
location /armhf/api/ {
proxy_set_header X-Real-IP $remote_addr;
- proxy_pass http://127.0.0.1:8487/api/;
+ proxy_pass http://127.0.0.1:8486/api/;
}
location = /armhf/api/v1/builds {
client_max_body_size 200M;
proxy_set_header X-Real-IP $remote_addr;
- proxy_pass http://127.0.0.1:8487/api/v1/builds;
+ proxy_pass http://127.0.0.1:8486/api/v1/builds;
}
location /armhf/stats/ {
- alias /srv/rebuilderd/armhf/stats/ ;
+ alias /srv/rebuilderd/arm/stats/ ;
disable_symlinks off;
}
# i386
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-arm64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-arm.conf
=====================================
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-armhf.conf deleted
=====================================
@@ -1,45 +0,0 @@
-## Configuration for http daemon
-[http]
-## The address to bind to. This is 127.0.0.1:8484 by default.
-bind_addr = "127.0.0.1:8487"
-## If you use a reverse proxy, use this header instead of the actual connecting ip.
-## Make sure the reverse proxy has filters in place to prevent spoofing issues.
-#real_ip_header = "X-Real-IP"
-## Set a default endpoint for rebuildctl. This is especially useful for the sync timer.
-#endpoint = "http://127.0.0.1:8484"
-
-## A random cookie for administration is generated at startup and written to /var/lib/rebuilderd/auth-cookie
-## You can set this to a fixed value here. Use `pwgen -1s 32` to generate one.
-## rebuildctl is searching for this cookie in ~/.config/rebuilderd.conf, /etc/rebuilderd.conf and
-## /var/lib/rebuilderd/auth-cookie in that order.
-[auth]
-#cookie = "INSECURE"
-
-## The auth cookie above is only used for the default endpoint.
-## You can use different endpoints with `rebuildctl -H https://rebuilder.example.com status`,
-## In that case you need to configure a section below if you want to attach a cookie.
-#[endpoints."https://rebuilder.example.com"]
-#cookie = "INSECURE"
-
-## IMPORTANT: in production, make sure either `authorized_workers` or `signup_secret` is configured.
-[worker]
-## If we have a fixed set of workers we can allow-list the keys here.
-#authorized_workers = ["key1", "key2"]
-## If we want to spawn new workers dynamically we can configure a sign up secret below.
-## Use `pwgen -1s 32` to generate one.
-signup_secret = "INSECURE"
-
-[schedule]
-## Configure the delay to automatically retry failed rebuilds in hours. The
-## default is 24h, this base is multiplied with the number of rebuilds, so the
-## first retry would happen after 24h, the second retry would happen 48h after the
-## first retry and the third retry would happen 72h after the second retry. There
-## is no upper limit of retries, if you can't afford frequent retries it's
-## recommended to set this to a high value like 168 (1 week) or higher.
-## Successful rebuilds are not retried.
-#retry_delay_base = 24
-
-## Configure the maximum number of times an unreproducible package will be retried (0 to N). There is no default upper
-## limit.
-max_retries = 3
-
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-arm64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-arm.conf
=====================================
@@ -1,7 +1,7 @@
[profile."debian"]
distro = "debian"
components = [ "main", "non-free-firmware", "main/debian-installer" ]
-architectures = ["arm64"]
+architectures = ["arm64", "armhf"]
releases = [
"trixie",
"trixie-backports",
=====================================
hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-armhf.conf deleted
=====================================
@@ -1,22 +0,0 @@
-[profile."debian"]
-distro = "debian"
-components = [ "main", "non-free-firmware", "main/debian-installer" ]
-architectures = ["armhf"]
-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*"]
=====================================
update_jdn.sh
=====================================
@@ -762,7 +762,7 @@ if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "ionos7-amd64" ] || [ "$HOSTNA
fi
# set secrets for rebuilderd and rebuilderd-workers
case $HOSTNAME in
- osuosl5*) for a in all amd64 arm64 armel armhf i386 ppc64el riscv64 loong64 ; do
+ osuosl5*) for a in all amd64 arm armel i386 ppc64el riscv64 loong64 ; do
SIGNUPSECRET="$(sudo cat /etc/rebuilderd/rebuilderd-${a}.secret)"
f=rebuilderd-${a}.conf
if [ -f /etc/rebuilderd/$f ] ; then
@@ -1047,9 +1047,9 @@ case $HOSTNAME in
*ppc64el) deploy_rebuilderd_services worker 1
;;
osuosl5*)
- deploy_rebuilderd_services rebuilderd "all amd64 arm64 armel armhf i386 loong64 ppc64el riscv64"
- deploy_rebuilderd_services pkgsync "all amd64 arm64 armel armhf i386 loong64 ppc64el riscv64"
- deploy_rebuilderd_services db-backup "all amd64 arm64 armel armhf i386 loong64 ppc64el riscv64"
+ deploy_rebuilderd_services rebuilderd "all amd64 arm armel i386 loong64 ppc64el riscv64"
+ deploy_rebuilderd_services pkgsync "all amd64 arm armel i386 loong64 ppc64el riscv64"
+ deploy_rebuilderd_services db-backup "all amd64 arm armel i386 loong64 ppc64el riscv64"
sudo systemctl enable --now rebuilderd-db-backup-compress.timer
;;
*) ;;
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/f14c2d5eba5841141ca337f1f6ac79bff854e675
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/f14c2d5eba5841141ca337f1f6ac79bff854e675
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20260916/87551bf6/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list