[Git][qa/jenkins.debian.net][master] rdn: move rebuilderd(-sync)-$arch.conf to /etc/rebuilderd/
Holger Levsen (@holger)
gitlab at salsa.debian.org
Wed Aug 20 19:08:36 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
b52a70a9 by Holger Levsen at 2025-08-20T20:08:19+02:00
rdn: move rebuilderd(-sync)-$arch.conf to /etc/rebuilderd/
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
29 changed files:
- bin/rebuilderd_pkgsync.sh
- hosts/codethink01-arm64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/codethink01-arm64/etc/rebuilderd/rebuilderd-worker.conf
- hosts/codethink02-arm64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/codethink02-arm64/etc/rebuilderd/rebuilderd-worker.conf
- hosts/codethink05-arm64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/codethink05-arm64/etc/rebuilderd/rebuilderd-worker.conf
- hosts/common-ppc64el/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/common-ppc64el/etc/rebuilderd/rebuilderd-worker.conf
- hosts/common-riscv64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/common-riscv64/etc/rebuilderd/rebuilderd-worker.conf
- hosts/infom07-amd64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/infom07-amd64/etc/rebuilderd/rebuilderd-worker.conf
- hosts/infom08-amd64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/infom08-amd64/etc/rebuilderd/rebuilderd-worker.conf
- hosts/ionos17-amd64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/ionos17-amd64/etc/rebuilderd/rebuilderd-worker.conf
- hosts/osuosl4-amd64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/osuosl4-amd64/etc/rebuilderd/rebuilderd-worker.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-all.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-all.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-amd64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-amd64.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-arm64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-arm64.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-armel.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-armel.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-armhf.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-armhf.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-i386.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-i386.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-ppc64el.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-ppc64el.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-riscv64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-riscv64.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-all.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-all.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-amd64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-amd64.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-arm64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-arm64.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-armel.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-armel.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-armhf.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-armhf.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-i386.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-i386.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-ppc64el.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-ppc64el.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-riscv64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-riscv64.conf
- hosts/osuosl5-amd64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-worker.conf
- hosts/osuosl5-amd64/etc/systemd/system/rebuilderd at .service
- update_jdn.sh
Changes:
=====================================
bin/rebuilderd_pkgsync.sh
=====================================
@@ -35,4 +35,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
-exec rebuildctl -H http://127.0.0.1:$PORT pkgs sync-profile --sync-config "/opt/etc/rebuilderd-sync-${ARCH}.conf" debian-main
+exec rebuildctl -H http://127.0.0.1:$PORT pkgs sync-profile --sync-config "/etc/rebuilderd/rebuilderd-sync-${ARCH}.conf" debian-main
=====================================
hosts/codethink01-arm64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/codethink01-arm64/etc/rebuilderd/rebuilderd-worker.conf
=====================================
=====================================
hosts/codethink02-arm64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/codethink02-arm64/etc/rebuilderd/rebuilderd-worker.conf
=====================================
=====================================
hosts/codethink05-arm64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/codethink05-arm64/etc/rebuilderd/rebuilderd-worker.conf
=====================================
=====================================
hosts/common-ppc64el/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/common-ppc64el/etc/rebuilderd/rebuilderd-worker.conf
=====================================
=====================================
hosts/common-riscv64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/common-riscv64/etc/rebuilderd/rebuilderd-worker.conf
=====================================
=====================================
hosts/infom07-amd64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/infom07-amd64/etc/rebuilderd/rebuilderd-worker.conf
=====================================
=====================================
hosts/infom08-amd64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/infom08-amd64/etc/rebuilderd/rebuilderd-worker.conf
=====================================
=====================================
hosts/ionos17-amd64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/ionos17-amd64/etc/rebuilderd/rebuilderd-worker.conf
=====================================
=====================================
hosts/osuosl4-amd64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/osuosl4-amd64/etc/rebuilderd/rebuilderd-worker.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-all.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-all.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-amd64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-amd64.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-arm64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-arm64.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-armel.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-armel.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-armhf.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-armhf.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-i386.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-i386.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-ppc64el.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-ppc64el.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-riscv64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-riscv64.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-all.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-all.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-amd64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-amd64.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-arm64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-arm64.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-armel.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-armel.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-armhf.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-armhf.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-i386.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-i386.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-ppc64el.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-ppc64el.conf
=====================================
=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-riscv64.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-sync-riscv64.conf
=====================================
=====================================
hosts/osuosl5-amd64/etc/rebuilderd-worker/rebuilderd-worker.conf → hosts/osuosl5-amd64/etc/rebuilderd/rebuilderd-worker.conf
=====================================
=====================================
hosts/osuosl5-amd64/etc/systemd/system/rebuilderd at .service
=====================================
@@ -6,7 +6,7 @@ After=rebuilderd_boot_cleanup.service
User=rebuilderd
Group=rebuilderd
Environment="REBUILDERD_COOKIE_PATH=/srv/rebuilderd/%i/.auth-cookie"
-ExecStart=/usr/bin/rebuilderd -c /opt/etc/rebuilderd-%i.conf
+ExecStart=/usr/bin/rebuilderd -c /etc/rebuilderd/rebuilderd-%i.conf
WorkingDirectory=/srv/rebuilderd/%i
ReadWritePaths=/srv/rebuilderd/%i
=====================================
update_jdn.sh
=====================================
@@ -753,9 +753,9 @@ case $HOSTNAME in
osuosl5*) for a in all amd64 arm64 armel armhf i386 ppc64el riscv64 ; do
SIGNUPSECRET="$(sudo cat /opt/etc/rebuilderd-${a}.secret)"
f=rebuilderd-${a}.conf
- if [ -f /opt/etc/$f ] ; then
- if grep -q '^signup_secret = "INSECURE"' /opt/etc/$f ; then
- sudo sed -i "s#^signup_secret = \"INSECURE\"#signup_secret = \"$SIGNUPSECRET\"#g" /opt/etc/$f
+ if [ -f /etc/rebuilderd/$f ] ; then
+ if grep -q '^signup_secret = "INSECURE"' /etc/rebuilderd/$f ; then
+ sudo sed -i "s#^signup_secret = \"INSECURE\"#signup_secret = \"$SIGNUPSECRET\"#g" /etc/rebuilderd/$f
fi
fi
done
@@ -764,7 +764,7 @@ case $HOSTNAME in
SIGNUPSECRET="$(sudo cat /opt/etc/rebuilderd.secret)"
f=rebuilderd-worker.conf
if [ -f /etc/rebuilderd-worker/$f ] ; then
- if grep -q '^signup_secret = "INSECURE"' /opt/etc/$f ; then
+ if grep -q '^signup_secret = "INSECURE"' /etc/rebuilderd-worker/$f ; then
sudo sed -i "s#^signup_secret = \"INSECURE\"#signup_secret = \"$SIGNUPSECRET\"#g" /etc/rebuilderd-worker/$f
fi
fi
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/b52a70a9d68cac70d6089395cdadbebe83cd0ceb
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/b52a70a9d68cac70d6089395cdadbebe83cd0ceb
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/20250820/d835534f/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list