[Git][qa/jenkins.debian.net][master] 2 commits: r.d.n.: use rebuildctl from trixie
Holger Levsen (@holger)
gitlab at salsa.debian.org
Mon Apr 7 15:16:43 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
5025655e by Holger Levsen at 2025-04-07T16:12:51+02:00
r.d.n.: use rebuildctl from trixie
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
e18daaa7 by Holger Levsen at 2025-04-07T16:16:33+02:00
r.d.n.: refactoring
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/var/www/html/rebuilderd-setup.html
- hosts/osuosl5-amd64/var/www/html/rebuilderd-usage.html
- update_jdn.sh
Changes:
=====================================
bin/rebuilderd_manual_scheduler.sh
=====================================
@@ -34,10 +34,9 @@ SUCCESSES=""
s=0
FAILURES=""
f=0
-for i in $PKGS ; do
- i=$(echo $i | tr -d 🍥 | tr -d ♻ | tr -d 💠)
+for i in $(echo -e $PKGS | tr -d 🍥 | tr -d ♻ | tr -d 💠)
echo -n "Scheduling $i: "
- if /opt/usr/bin/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
=====================================
@@ -33,13 +33,13 @@ 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
-if RESULT="$(/opt/usr/bin/rebuildctl -H http://127.0.0.1:$PORT pkgs sync-profile \
+if RESULT="$(rebuildctl -H http://127.0.0.1:$PORT pkgs sync-profile \
--sync-config /opt/etc/rebuilderd-sync-${ARCH}.conf debian-main \
--print-json)" ; then
echo -e "$RESULT" \
| jq "$JQQUERY" \
| jq -s \
- | /opt/usr/bin/rebuildctl -H http://127.0.0.1:$PORT pkgs sync-stdin debian main
+ | rebuildctl -H http://127.0.0.1:$PORT pkgs sync-stdin debian main
else
echo "rebuildctl -H http://127.0.0.1:$PORT pkgs sync-profile failed:"
echo -e "$RESULT"
=====================================
hosts/osuosl5-amd64/var/www/html/rebuilderd-setup.html
=====================================
@@ -104,10 +104,10 @@ apt-get -o Dir=. source --download-only "$(basename "$1" | cut -d_ -f1)"
/opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd.conf
#
# run this in screen as $USER to update the list of packages frequently
-while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8484 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync.conf debian-main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
+while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8484 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync.conf debian-main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
# for rebuilding arch:any only:
#
-# while true ; do /opt/usr/bin/rebuildctl pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | /opt/usr/bin/rebuildctl pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
+# while true ; do rebuildctl pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | rebuildctl pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
#
# until https://github.com/kpcyrd/rebuilderd/issues/152 has been fixed,
@@ -137,23 +137,23 @@ sed -i "s#reproduce.debian.net#$REBUILDERD_HOSTNAME#g" index.html
# it gets messy, how to run more archs on one machine:
cd ; mkdir -p all ; cd all ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-all.conf
-while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8489 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-all.conf debian-main --print-json | jq '.[] | select(.architecture = "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8489 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
+while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8489 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-all.conf debian-main --print-json | jq '.[] | select(.architecture = "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8489 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
# it gets messy, how to run more archs on one machine:
cd ; mkdir -p amd64 ; cd amd64 ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-amd64.conf
-while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8484 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-amd64.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8484 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
+while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8484 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-amd64.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8484 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
cd ; mkdir -p arm64 ; cd arm64 ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-arm64.conf
-while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8486 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-arm64.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8486 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
+while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8486 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-arm64.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8486 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
cd ; mkdir -p armhf ; cd armhf ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-armhf.conf
-while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8487 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-armhf.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8487 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
+while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8487 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-armhf.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8487 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
cd ; mkdir -p i386 ; cd i386 ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-i386.conf
-while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8485 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-i386.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8485 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
+while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8485 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-i386.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8485 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
cd ; mkdir -p riscv64 ; cd riscv64 ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-riscv64.conf
-while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8488 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-riscv64.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8488 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
+while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8488 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-riscv64.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8488 pkgs sync-stdin debian main ; ST=$(shuf -i 150-210 -n 1) ; echo sleeping ${ST}m now ; sleep ${ST}m ; done
# with rebuilderd-worker from trixie:
=====================================
hosts/osuosl5-amd64/var/www/html/rebuilderd-usage.html
=====================================
@@ -34,7 +34,7 @@ run all commands as the user rebuilderd is running.
watching the queue
==================
-watch -n 60 -c /opt/usr/bin/rebuildctl -H http://127.0.0.1:8484/ queue ls -C --head
+watch -n 60 -c rebuildctl -H http://127.0.0.1:8484/ queue ls -C --head
reschedule known temporarily (or fixed) failures
@@ -73,7 +73,7 @@ done
to empty the queue and schedule all UNKWN packages again:
=========================================================
echo 'delete from queue;' | sqlite3 rebuilderd.db
-env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8484 pkgs requeue --status UNKWN
+env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie rebuildctl -H http://127.0.0.1:8484 pkgs requeue --status UNKWN
# < kpcyrd> also while looking into the code further, I think setting the status back to
# UNKWN through sql may cause the package to be stuck in that status indefintely, maybe we shouldn't be doing that anymore
# < h01ger> kpcyrd: how do i empty the queue with rebuildctl? :)
=====================================
update_jdn.sh
=====================================
@@ -573,6 +573,7 @@ if [ -f /etc/debian_version ] ; then
diffoscope
python3-rpy2
python3-psutil
+ rebuildctl
" ;;
*) ;;
esac
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/48d64fc953259e1894980ba1d415af5bdeb9b203...e18daaa78f064a3150298196cc2b5fd51dd68357
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/48d64fc953259e1894980ba1d415af5bdeb9b203...e18daaa78f064a3150298196cc2b5fd51dd68357
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/20250407/5bfe9567/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list