[Git][qa/jenkins.debian.net][master] rdn: actually run the code from https://github.com/kpcyrd/rebuilderd/pull/184...

[Holger Levsen (@holger)]

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


Commits:
a94085bb by Holger Levsen at 2025-08-21T22:09:20+02:00
rdn: actually run the code from https://github.com/kpcyrd/rebuilderd/pull/184 for the amd64-pull184 pseudo-arch

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

- - - - -


5 changed files:

- bin/rebuilderd_manual_scheduler.sh
- bin/rebuilderd_pkgsync.sh
- + hosts/osuosl5-amd64/etc/systemd/system/rebuilderd-pull184 at .service
- hosts/osuosl5-amd64/var/www/html/amd64-pull184/index.html
- update_jdn.sh


Changes:

=====================================
bin/rebuilderd_manual_scheduler.sh
=====================================
@@ -5,6 +5,7 @@
 
 set -e
 
+REBUILDCTL=/usr/bin/rebuildctl
 #
 # choose correct port
 #
@@ -20,6 +21,7 @@ case $1 in
 	amd64)		PORT=8484
 			;;
 	amd64-pull184)	PORT=8494
+			REBUILDCTL=/usr/local/usr/bin/rebuildctl
 			;;
 	arm64)		PORT=8486
 			;;
@@ -48,7 +50,7 @@ FAILURES=""
 f=0
 for i in $(echo -e $PKGS | tr -d 🍥 | tr -d 🔬 | tr -d 💠 | tr -d '#') ; do
 	echo -n "Scheduling $i: "
-	if rebuildctl -H http://127.0.0.1:$PORT pkgs requeue --reset --distro debian --name $i ; then
+	if $REBUILDCTL -H http://127.0.0.1:$PORT pkgs requeue --reset --distro debian --name $i ; then
 		SUCCESSES="$SUCCESSES $i"
 		let s+=1
 		echo ok


=====================================
bin/rebuilderd_pkgsync.sh
=====================================
@@ -7,6 +7,7 @@ set -e
 set -o pipefail		# see eg http://petereisentraut.blogspot.com/2010/11/pipefail.html
 
 ARCH=$1
+REBUILDCTL=/usr/bin/rebuildctl
 #
 # choose correct port
 #
@@ -16,6 +17,7 @@ case $ARCH in
 	amd64)		PORT=8484
 			;;
 	amd64-pull184)	PORT=8494
+			REBUILDCTL=/usr/local/usr/bin/rebuildctl
 			;;
 	arm64)		PORT=8486
 			;;
@@ -37,4 +39,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 "/etc/rebuilderd/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/osuosl5-amd64/etc/systemd/system/rebuilderd-pull184 at .service
=====================================
@@ -0,0 +1,20 @@
+[Unit]
+Description=rebuilderd: main rebuilderd instances
+After=rebuilderd_boot_cleanup.service
+
+[Service]
+User=rebuilderd
+Group=rebuilderd
+Environment="REBUILDERD_COOKIE_PATH=/srv/rebuilderd/%i/.auth-cookie"
+ExecStart=/usr/local/usr/bin/rebuilderd -c /etc/rebuilderd/rebuilderd-%i.conf
+WorkingDirectory=/srv/rebuilderd/%i
+ReadWritePaths=/srv/rebuilderd/%i
+
+CapabilityBoundingSet=
+NoNewPrivileges=yes
+ProtectSystem=strict
+Restart=always
+RestartSec=0
+
+[Install]
+WantedBy=multi-user.target


=====================================
hosts/osuosl5-amd64/var/www/html/amd64-pull184/index.html
=====================================
@@ -185,7 +185,7 @@
 		<a href="https://reproduce.debian.net">reproduce</a>.debian.net/<a href="https://amd64-pull184.reproduce.debian.net">amd64-pull184</a>
  </h1>
 	<h1>
-		running https://github.com/kpcyrd/rebuilderd/pull/184 soon
+		running https://github.com/kpcyrd/rebuilderd/pull/184
 	</h1>
         <a href="stats/rb.png"><img src="stats/rb.png" align="right"></a>
         <h3>


=====================================
update_jdn.sh
=====================================
@@ -988,8 +988,12 @@ deploy_rebuilderd_services() {
 
 				elif [ "$1" = "rebuilderd" ] ; then
 					for i in $2 ; do
+						case $i in
+							*pull184) 	SERVICE_FILE=rebuilderd-pull184 at .service ;;
+							*)		SERVICE_FILE=rebuilderd at .service ;;
+						esac
 						mkdir4rebuilderd /srv/rebuilderd/$i
-						sudo ln -sf rebuilderd at .service rebuilderd@${i}.service
+						sudo ln -sf $SERVICE_FILE rebuilderd@${i}.service
 						sudo systemctl enable --now rebuilderd@${i}.service
 					done
 				elif [ "$1" = "pkgsync" ] ; then



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/a94085bbc00be0ceacc972cc9cd4b745c97e7ab9

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/a94085bbc00be0ceacc972cc9cd4b745c97e7ab9
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/20250821/cf56fe32/attachment-0001.htm>