[gentoo-commits] proj/binhost:master commit in: builders/milou/

[Andreas K. Hüttel]

commit:     8d7e9bce1d7ab380b9678085a998292df9a73eb1
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 13 02:20:52 2025 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 13 02:20:52 2025 +0000
URL:        https://gitweb.gentoo.org/proj/binhost.git/commit/?id=8d7e9bce

Convert milou from fstab hack to an external binpkgs directory bind-mounted by 
nspawn

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 builders/milou/binhost-update | 10 ++++++----
 builders/milou/fstab.inc      | 10 ----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index 62a8f20..1b671d4 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -20,6 +20,8 @@ NSPAWN_NAMES=(
        "${NSPAWNS_x8664_23[@]}"
 )
 
+NSPAWN_PKGDIR='.binhost-amd64-x86-64.binpkgs'
+
 UPLOAD_USER=amd64
 UPLOAD_KEY=/root/.ssh/id_ed25519
 
@@ -89,8 +91,8 @@ verify_dnssec() {
 
 upload_all() {
        local -; set +x
-       cp ${TMPFILE} 
/var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs/last-build.log
-       upsync_binpackages 
/var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs 
amd64/23.0/x86-64 &>> ${TMPFILE}
+       cp ${TMPFILE} /var/lib/machines/${NSPAWN_PKGDIR}/last-build.log
+       upsync_binpackages /var/lib/machines/${NSPAWN_PKGDIR} amd64/23.0/x86-64 
&>> ${TMPFILE}
 }
 
 checkpoint_build() {
@@ -124,7 +126,7 @@ starttime=$(date +%s)
 exec {BASH_XTRACEFD}>> ${TMPFILE}
 set -x
 
-nspawn_command=(systemd-nspawn --bind /var/cache/distfiles --bind-ro 
/var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g)
+nspawn_command=(systemd-nspawn --bind /var/cache/distfiles --bind 
/var/lib/machines/${NSPAWN_PKGDIR}:/var/cache/binpkgs --bind-ro 
/var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g)
 for n in "${NSPAWN_NAMES[@]}" ; do
        machinedir=/var/lib/machines/${n}
        echo Machine ${n} &>> ${TMPFILE}
@@ -143,7 +145,7 @@ for n in "${NSPAWN_NAMES[@]}" ; do
                for variant in ${machinedir}/${builder}/variants/*; do
                        [[ -d ${variant} ]] || break
                        echo "Variant: ${variant}" &>> ${TMPFILE}
-                       "${nspawn_command[@]}" --ephemeral --bind 
${machinedir}/var/cache/binpkgs:/var/cache/binpkgs -M ${n} /root/bin/run-update 
${variant##*/} &>> ${TMPFILE}
+                       "${nspawn_command[@]}" --ephemeral -M ${n} 
/root/bin/run-update ${variant##*/} &>> ${TMPFILE}
                        let "anyfail+=$?"
                        checkpoint_build
                done

diff --git a/builders/milou/fstab.inc b/builders/milou/fstab.inc
deleted file mode 100644
index 8027800..0000000
--- a/builders/milou/fstab.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-# for the binhosts, mount package dirs together (per abi)
-
-/var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs 
/var/lib/machines/binhost-amd64-x86-64-gnome-23/var/cache/binpkgs bind bind 0 0
-/var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs 
/var/lib/machines/binhost-amd64-x86-64-server-23/var/cache/binpkgs bind bind 0 0
-/var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs 
/var/lib/machines/binhost-amd64-x86-64-openrc-23/var/cache/binpkgs bind bind 0 0
-
-/var/lib/machines/binhost-amd64-x86-64-v3-kde-23/var/cache/binpkgs 
/var/lib/machines/binhost-amd64-x86-64-v3-gnome-23/var/cache/binpkgs bind bind 
0 0
-/var/lib/machines/binhost-amd64-x86-64-v3-kde-23/var/cache/binpkgs 
/var/lib/machines/binhost-amd64-x86-64-v3-server-23/var/cache/binpkgs bind bind 
0 0
-/var/lib/machines/binhost-amd64-x86-64-v3-kde-23/var/cache/binpkgs 
/var/lib/machines/binhost-amd64-x86-64-v3-openrc-23/var/cache/binpkgs bind bind 
0 0
-