aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2024-01-10 07:28:14 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2024-01-10 07:28:14 +0100
commitc9e75f245bd8303d9ce72110fcbfa3857d541f5d (patch)
tree3900536e64788612dc0a5b95a3d11ddbdb462ed1
parentBetter fail detection logic (diff)
downloadbinhost-c9e75f245bd8303d9ce72110fcbfa3857d541f5d.tar.gz
binhost-c9e75f245bd8303d9ce72110fcbfa3857d541f5d.tar.bz2
binhost-c9e75f245bd8303d9ce72110fcbfa3857d541f5d.zip
Some beautification
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rwxr-xr-xbuilders/demeter/binhost-update6
-rwxr-xr-xbuilders/jiji/binhost-update6
2 files changed, 6 insertions, 6 deletions
diff --git a/builders/demeter/binhost-update b/builders/demeter/binhost-update
index 9ea2afc..5245c5f 100755
--- a/builders/demeter/binhost-update
+++ b/builders/demeter/binhost-update
@@ -11,11 +11,11 @@ EMAIL_TO=gentoo-binhost-autobuilds@lists.gentoo.org
NSPAWN_NAMES="binhost-amd64-x86-64-kde binhost-amd64-x86-64-gnome binhost-amd64-x86-64-server binhost-amd64-x86-64-v3-kde binhost-amd64-x86-64-v3-gnome binhost-amd64-x86-64-v3-server"
-MAX_HARMLESS=200
-
UPLOAD_USER=amd64
UPLOAD_KEY=/root/.ssh/id_rsa
+TMPFS_SIZE=32
+
send_email() {
local subject="[binhost ${BINHOST_NAME}] $1"
@@ -100,7 +100,7 @@ for n in ${NSPAWN_NAMES} ; do
cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
git pull -q &>> ${TMPFILE}
cd /root &>> ${TMPFILE}
- systemd-nspawn --bind /var/cache/distfiles --bind-ro /var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=32g -M ${n} /root/bin/run-update &>> ${TMPFILE}
+ systemd-nspawn --bind /var/cache/distfiles --bind-ro /var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g -M ${n} /root/bin/run-update &>> ${TMPFILE}
let "anyfail+=$?"
done
diff --git a/builders/jiji/binhost-update b/builders/jiji/binhost-update
index 0becbb9..2cda38b 100755
--- a/builders/jiji/binhost-update
+++ b/builders/jiji/binhost-update
@@ -11,11 +11,11 @@ EMAIL_TO=gentoo-binhost-autobuilds@lists.gentoo.org
NSPAWN_NAMES="binhost-arm64-kde binhost-arm64-gnome binhost-arm64-server binhost-arm64-kde-23 binhost-arm64-gnome-23 binhost-arm64-server-23"
-MAX_HARMLESS=200
-
UPLOAD_USER=arm64
UPLOAD_KEY=/root/.ssh/id_ed25519
+TMPFS_SIZE=64
+
send_email() {
local subject="[binhost ${BINHOST_NAME}] $1"
@@ -100,7 +100,7 @@ for n in ${NSPAWN_NAMES} ; do
cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
git pull -q &>> ${TMPFILE}
cd /root &>> ${TMPFILE}
- systemd-nspawn --bind /var/cache/distfiles --bind-ro /var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=64g -M ${n} /root/bin/run-update &>> ${TMPFILE}
+ systemd-nspawn --bind /var/cache/distfiles --bind-ro /var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g -M ${n} /root/bin/run-update &>> ${TMPFILE}
let "anyfail+=$?"
done