* [gentoo-commits] proj/binhost:master commit in: builders/jiji/, builders/demeter/
@ 2024-01-09 12:46 Andreas K. Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-01-09 12:46 UTC (permalink / raw
To: gentoo-commits
commit: bf83f60e13092650e4b0747e52cb849b1ce9e00f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 12:46:22 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 12:46:22 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=bf83f60e
Use tmpfs in builders for /var/tmp
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/demeter/binhost-update | 2 +-
builders/jiji/binhost-update | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builders/demeter/binhost-update b/builders/demeter/binhost-update
index 1b595dc..9e6822b 100755
--- a/builders/demeter/binhost-update
+++ b/builders/demeter/binhost-update
@@ -98,7 +98,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 -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=32g -M ${n} /root/bin/run-update &>> ${TMPFILE}
done
diff --git a/builders/jiji/binhost-update b/builders/jiji/binhost-update
index 4ac9236..f9d1b7b 100755
--- a/builders/jiji/binhost-update
+++ b/builders/jiji/binhost-update
@@ -98,7 +98,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 -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=64g -M ${n} /root/bin/run-update &>> ${TMPFILE}
done
upsync_binpackages /var/lib/machines/binhost-arm64-kde/var/cache/binpkgs arm64/17.0/arm64 &>> ${TMPFILE}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/binhost:master commit in: builders/jiji/, builders/demeter/
@ 2024-01-10 6:28 Andreas K. Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-01-10 6:28 UTC (permalink / raw
To: gentoo-commits
commit: c29fbdb8c8b98b1cc677e575c8142b1a5289bbc5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 06:24:53 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 06:24:53 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=c29fbdb8
Better fail detection logic
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/demeter/binhost-update | 7 +++++--
builders/jiji/binhost-update | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/builders/demeter/binhost-update b/builders/demeter/binhost-update
index 9e6822b..9ea2afc 100755
--- a/builders/demeter/binhost-update
+++ b/builders/demeter/binhost-update
@@ -92,6 +92,8 @@ echo Syncing host &>> ${TMPFILE}
emerge --sync -q &>> ${TMPFILE}
+anyfail=0
+
for n in ${NSPAWN_NAMES} ; do
echo Machine ${n} &>> ${TMPFILE}
echo &>> ${TMPFILE}
@@ -99,6 +101,7 @@ for n in ${NSPAWN_NAMES} ; do
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}
+ let "anyfail+=$?"
done
@@ -106,9 +109,9 @@ upsync_binpackages /var/lib/machines/binhost-amd64-x86-64-kde/var/cache/binpkgs
upsync_binpackages /var/lib/machines/binhost-amd64-x86-64-v3-kde/var/cache/binpkgs amd64/17.1/x86-64-v3 &>> ${TMPFILE}
-if [[ $(wc -l ${TMPFILE} | sed -e 's: .*$::g') -gt ${MAX_HARMLESS} ]] ; then
+if [[ ${anyfail} -gt 0 ]] ; then
- send_email "Update possibly failed" "Binhost ${BINHOST_NAME} update produced long output" ${TMPFILE}
+ send_email "Update failed" "Binhost ${BINHOST_NAME} update failed in at least one nspawn" ${TMPFILE}
fi
diff --git a/builders/jiji/binhost-update b/builders/jiji/binhost-update
index f9d1b7b..0becbb9 100755
--- a/builders/jiji/binhost-update
+++ b/builders/jiji/binhost-update
@@ -92,6 +92,8 @@ echo Syncing host &>> ${TMPFILE}
emerge --sync -q &>> ${TMPFILE}
+anyfail=0
+
for n in ${NSPAWN_NAMES} ; do
echo Machine ${n} &>> ${TMPFILE}
echo &>> ${TMPFILE}
@@ -99,14 +101,15 @@ for n in ${NSPAWN_NAMES} ; do
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}
+ let "anyfail+=$?"
done
upsync_binpackages /var/lib/machines/binhost-arm64-kde/var/cache/binpkgs arm64/17.0/arm64 &>> ${TMPFILE}
upsync_binpackages /var/lib/machines/binhost-arm64-kde-23/var/cache/binpkgs arm64/23.0/arm64 &>> ${TMPFILE}
-if [[ $(wc -l ${TMPFILE} | sed -e 's: .*$::g') -gt ${MAX_HARMLESS} ]] ; then
+if [[ ${anyfail} -gt 0 ]] ; then
- send_email "Update possibly failed" "Binhost ${BINHOST_NAME} update produced long output" ${TMPFILE}
+ send_email "Update failed" "Binhost ${BINHOST_NAME} update failed in at least one nspawn" ${TMPFILE}
fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/binhost:master commit in: builders/jiji/, builders/demeter/
@ 2024-01-10 6:28 Andreas K. Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-01-10 6:28 UTC (permalink / raw
To: gentoo-commits
commit: c9e75f245bd8303d9ce72110fcbfa3857d541f5d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 06:28:14 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 06:28:14 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=c9e75f24
Some beautification
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/demeter/binhost-update | 6 +++---
builders/jiji/binhost-update | 6 +++---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/binhost:master commit in: builders/jiji/, builders/demeter/
@ 2024-01-10 6:38 Andreas K. Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-01-10 6:38 UTC (permalink / raw
To: gentoo-commits
commit: 0dc86c2c252b77c703275e6ad3092d49325ee2e1
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 06:33:28 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 06:33:28 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=0dc86c2c
Record file transfer stats
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/demeter/binhost-update | 1 +
builders/jiji/binhost-update | 1 +
2 files changed, 2 insertions(+)
diff --git a/builders/demeter/binhost-update b/builders/demeter/binhost-update
index 5245c5f..8b2ddf4 100755
--- a/builders/demeter/binhost-update
+++ b/builders/demeter/binhost-update
@@ -55,6 +55,7 @@ upsync_binpackages() {
--omit-dir-times
--delay-updates
--mkpath
+ --stats
)
rsync "${RSYNC_OPTS[@]}" "$1"/* "${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
}
diff --git a/builders/jiji/binhost-update b/builders/jiji/binhost-update
index 2cda38b..17953d0 100755
--- a/builders/jiji/binhost-update
+++ b/builders/jiji/binhost-update
@@ -55,6 +55,7 @@ upsync_binpackages() {
--omit-dir-times
--delay-updates
--mkpath
+ --stats
)
rsync "${RSYNC_OPTS[@]}" "$1"/* "${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-01-10 6:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-09 12:46 [gentoo-commits] proj/binhost:master commit in: builders/jiji/, builders/demeter/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2024-01-10 6:28 Andreas K. Hüttel
2024-01-10 6:28 Andreas K. Hüttel
2024-01-10 6:38 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox