Commit a94085bb authored by Holger Levsen's avatar Holger Levsen
Browse files

rdn: actually run the code from https://github.com/kpcyrd/rebuilderd/pull/184... 

rdn: actually run the code from https://github.com/kpcyrd/rebuilderd/pull/184

 for the amd64-pull184 pseudo-arch

Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 6634d907

bin/rebuilderd_manual_scheduler.sh

+3 −1
Original line number Diff line number Diff line
@@ -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

+3 −1
Original line number Diff line number Diff line
@@ -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@.service

0 → 100644
+20 −0
Original line number Diff line number Diff line 
[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

+1 −1
Original line number Diff line number Diff line
@@ -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

+5 −1
Original line number Diff line number Diff line
@@ -988,8 +988,12 @@ deploy_rebuilderd_services() { 


				elif [ "$1" = "rebuilderd" ] ; then

					for i in $2 ; do

						case $i in

							*pull184) 	SERVICE_FILE=rebuilderd-pull184@.service ;;

							*)		SERVICE_FILE=rebuilderd@.service ;;

						esac

						mkdir4rebuilderd /srv/rebuilderd/$i

						sudo ln -sf rebuilderd@.service rebuilderd@${i}.service

						sudo ln -sf $SERVICE_FILE rebuilderd@${i}.service

						sudo systemctl enable --now rebuilderd@${i}.service

					done

				elif [ "$1" = "pkgsync" ] ; then