From: Erik Mackdanz <erikmack@gmail.com>
Date: Thu, 14 Aug 2025 23:09:53 +0000 (+0000)
Subject: nspawn worker instructions, use llvm base image
X-Git-Url: https://git.humopery.space/?a=commitdiff_plain;h=5058e6938c7d9dc58c659dce8e322e77f6aa6b6f;p=private%2Fbuildbot-default.git

nspawn worker instructions, use llvm base image
---

diff --git a/nspawn-worker.md b/nspawn-worker.md
index 521ba35..b8c7291 100644
--- a/nspawn-worker.md
+++ b/nspawn-worker.md
@@ -1,11 +1,13 @@
 # Do all this as root
 
 # Get a base image
-rawtree=stage3-amd64-systemd-20250803T163732Z
-importctl pull-tar --class machine --verify no https://distfiles.gentoo.org/releases/amd64/autobuilds/current-stage3-amd64-systemd/${rawtree}.tar.xz
+releaseflavor=stage3-amd64-llvm-systemd
+release=${releaseflavor}-20250810T165238Z
+# use current-stage3-amd64-llvm-systemd so can maybe skip the llvm install later
+importctl pull-tar --class machine --verify no https://distfiles.gentoo.org/releases/amd64/autobuilds/current-${releaseflavor}/${release}.tar.xz
 
 # Make a place to prep the worker files
-btrfs su snapshot /var/lib/machines/${rawtree} /var/lib/machines/prepworker
+btrfs su snapshot /var/lib/machines/${release} /var/lib/machines/prepworker
 
 # prep portage tree
 rsync -av /var/db/repos/gentoo /var/lib/machines/prepworker/var/db/repos
@@ -13,12 +15,10 @@ rsync -av /var/db/repos/gentoo /var/lib/machines/prepworker/var/db/repos
 # prep from within
 systemd-nspawn --machine prepworker sh -c "echo 'dev-lang/rust-bin clippy' >/etc/portage/package.use/rust"
 # waterslager needs clang
-systemd-nspawn --machine prepworker emerge --noreplace dev-python/pip dev-lang/rust-bin dev-vcs/git llvm-core/clang-runtime
+systemd-nspawn --machine prepworker emerge --noreplace dev-python/pip dev-lang/rust-bin dev-vcs/git
 systemd-nspawn --machine prepworker pip install --break-system-packages buildbot-worker pyOpenSSL service-identity
 systemd-nspawn --machine prepworker sh -c "groupadd buildbot && useradd -g buildbot -m buildbot"
-systemd-nspawn --machine prepworker --user buildbot mkdir -p /home/buildbot/info
-systemd-nspawn --machine prepworker --user buildbot sh -c "echo 'Erik Mackdanz <erik@humopery.space>' >/home/buildbot/info/admin"
-systemd-nspawn --machine prepworker --user buildbot sh -c "echo 'Eriks laptop' >/home/buildbot/info/host"
+systemd-nspawn --machine prepworker --user buildbot sh -c "mkdir -p /home/buildbot/info; echo 'Erik Mackdanz <erik@humopery.space>' >/home/buildbot/info/admin; echo 'Eriks laptop' >/home/buildbot/info/host"
 
 systemd-nspawn --machine prepworker --user buildbot sh -c "mkdir -p /home/buildbot/.ssh; chmod 700 /home/buildbot/.ssh"
 cat >/var/lib/machines/prepworker/home/buildbot/.ssh/config <<EOF
@@ -73,7 +73,7 @@ systemd-nspawn --machine worker1 passwd buildbot
 systemd-nspawn --machine worker1 --user buildbot ssh-keygen
 cat /var/lib/machines/worker1/home/buildbot/.ssh/id_ed25519.pub
 # ^^ and copy this into lin0/sra0 ~/.ssh/authorized_keys
-systemd-nspawn --machine worker1 --user buildbot buildbot-worker create-worker --connection-string ssl:bb.humopery.space:9989 --use-tls /home/buildbot bb.humopery.space:9989 carb-ns-1 Thaishu3ohQuieQu5che
+systemd-nspawn --machine worker1 --user buildbot buildbot-worker create-worker --connection-string ssl:bb.humopery.space:9989 --use-tls /home/buildbot bb.humopery.space:9989 carb-ns-1 'Thaishu3ohQuieQu5che'
 
 # start in foreground
 systemd-nspawn --machine worker1 --boot