* [gentoo-commits] proj/binhost:master commit in: builders/milou/
@ 2024-02-07 12:37 Andreas K. Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Hüttel @ 2024-02-07 12:37 UTC (permalink / raw
To: gentoo-commits
commit: c7e5128eb2f8d3a9d4e253cfd4920a2edb449e75
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 7 12:36:52 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Feb 7 12:37:02 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=c7e5128e
Update key file name
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/milou/binhost-update | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index ec1b9f9..9854fce 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -12,7 +12,7 @@ EMAIL_TO=gentoo-binhost-autobuilds@lists.gentoo.org
NSPAWN_NAMES="binhost-amd64-x86-64-kde binhost-amd64-x86-64-gnome binhost-amd64-x86-64-openrc binhost-amd64-x86-64-server binhost-amd64-x86-64-v3-kde binhost-amd64-x86-64-v3-gnome binhost-amd64-x86-64-v3-openrc binhost-amd64-x86-64-v3-server"
UPLOAD_USER=amd64
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
TMPFS_SIZE=48
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/binhost:master commit in: builders/milou/
@ 2024-02-07 12:53 Andreas K. Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Hüttel @ 2024-02-07 12:53 UTC (permalink / raw
To: gentoo-commits
commit: 3b897891066388758b0e65568c95890f0735cf2e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 7 12:53:05 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Feb 7 12:53:05 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=3b897891
Less -q
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/milou/binhost-update | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index 9854fce..f4710bd 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -100,7 +100,7 @@ for n in ${NSPAWN_NAMES} ; do
echo &>> ${TMPFILE}
cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
git reset --hard &>> ${TMPFILE}
- git pull -q &>> ${TMPFILE}
+ git pull &>> ${TMPFILE}
cd /root &>> ${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+=$?"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/binhost:master commit in: builders/milou/
@ 2024-02-29 11:29 Andreas K. Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Hüttel @ 2024-02-29 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 1cc6bee3495b17e64c1711d4e8decbdeb5a4a856
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 29 11:26:05 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 11:28:55 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=1cc6bee3
Enable amd64 23.0 builders
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/milou/binhost-update | 39 +++++++++++++++++++++++++++++++++++++--
builders/milou/fstab.inc | 18 ++++++++++++++++++
2 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index f4710bd..f792c93 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -1,6 +1,6 @@
#!/bin/bash
-BINHOST_NAME=amd64/17.1/x86-64
+BINHOST_NAME=amd64/xx.x/x86-64
_BINHOST_NAME=$(echo ${BINHOST_NAME}|sed -e 's:/:_:g')
TMPFILE="/root/.tmp-binhost-${_BINHOST_NAME}-update-$(date +%s)"
@@ -9,7 +9,40 @@ LOCKFILE="/root/.tmp-binhost-${_BINHOST_NAME}-lock"
EMAIL_FROM=binhost@milou.amd64.dev.gentoo.org
EMAIL_TO=gentoo-binhost-autobuilds@lists.gentoo.org
-NSPAWN_NAMES="binhost-amd64-x86-64-kde binhost-amd64-x86-64-gnome binhost-amd64-x86-64-openrc binhost-amd64-x86-64-server binhost-amd64-x86-64-v3-kde binhost-amd64-x86-64-v3-gnome binhost-amd64-x86-64-v3-openrc binhost-amd64-x86-64-v3-server"
+NSPAWNS_x8664_17="
+ binhost-amd64-x86-64-kde
+ binhost-amd64-x86-64-gnome
+ binhost-amd64-x86-64-openrc
+ binhost-amd64-x86-64-server
+"
+
+NSPAWNS_x8664v3_17="
+ binhost-amd64-x86-64-v3-kde
+ binhost-amd64-x86-64-v3-gnome
+ binhost-amd64-x86-64-v3-openrc
+ binhost-amd64-x86-64-v3-server
+"
+
+NSPAWNS_x8664_23="
+ binhost-amd64-x86-64-kde-23
+ binhost-amd64-x86-64-gnome-23
+ binhost-amd64-x86-64-openrc-23
+ binhost-amd64-x86-64-server-23
+"
+
+NSPAWNS_x8664v3_23="
+ binhost-amd64-x86-64-v3-kde-23
+ binhost-amd64-x86-64-v3-gnome-23
+ binhost-amd64-x86-64-v3-openrc-23
+ binhost-amd64-x86-64-v3-server-23
+"
+
+NSPAWN_NAMES="
+ ${NSPAWNS_x8664_17}
+ ${NSPAWNS_x8664v3_17}
+ ${NSPAWNS_x8664_23}
+ ${NSPAWNS_x8664v3_23}
+"
UPLOAD_USER=amd64
UPLOAD_KEY=/root/.ssh/id_ed25519
@@ -109,6 +142,8 @@ done
upsync_binpackages /var/lib/machines/binhost-amd64-x86-64-kde/var/cache/binpkgs amd64/17.1/x86-64 &>> ${TMPFILE}
upsync_binpackages /var/lib/machines/binhost-amd64-x86-64-v3-kde/var/cache/binpkgs amd64/17.1/x86-64-v3 &>> ${TMPFILE}
+upsync_binpackages /var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs amd64/23.0/x86-64 &>> ${TMPFILE}
+upsync_binpackages /var/lib/machines/binhost-amd64-x86-64-v3-kde-23/var/cache/binpkgs amd64/23.0/x86-64-v3 &>> ${TMPFILE}
if [[ ${anyfail} -gt 0 ]] ; then
diff --git a/builders/milou/fstab.inc b/builders/milou/fstab.inc
new file mode 100644
index 0000000..9961208
--- /dev/null
+++ b/builders/milou/fstab.inc
@@ -0,0 +1,18 @@
+# for the binhosts, mount package dirs together (per abi)
+
+/var/lib/machines/binhost-amd64-x86-64-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-gnome/var/cache/binpkgs bind bind 0 0
+/var/lib/machines/binhost-amd64-x86-64-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-server/var/cache/binpkgs bind bind 0 0
+/var/lib/machines/binhost-amd64-x86-64-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-openrc/var/cache/binpkgs bind bind 0 0
+
+/var/lib/machines/binhost-amd64-x86-64-v3-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-v3-gnome/var/cache/binpkgs bind bind 0 0
+/var/lib/machines/binhost-amd64-x86-64-v3-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-v3-server/var/cache/binpkgs bind bind 0 0
+/var/lib/machines/binhost-amd64-x86-64-v3-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-v3-openrc/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-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
+
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/binhost:master commit in: builders/milou/
@ 2024-09-13 1:43 Eli Schwartz
0 siblings, 0 replies; 7+ messages in thread
From: Eli Schwartz @ 2024-09-13 1:43 UTC (permalink / raw
To: gentoo-commits
commit: 9fe325b4317d3d8777fd845c26975192359e0ff0
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 01:41:26 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 01:43:24 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=9fe325b4
enhanced logging for the base update script
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
builders/milou/binhost-update | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index d48e15e..2f69534 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -113,6 +113,9 @@ emerge --sync -q &>> ${TMPFILE}
anyfail=0
+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)
for n in ${NSPAWN_NAMES} ; do
machinedir=/var/lib/machines/${n}
@@ -127,13 +130,16 @@ for n in ${NSPAWN_NAMES} ; do
let "anyfail+=${ret}"
if [[ ${ret} = 0 ]]; then
builder=$(readlink ${machinedir}/etc/portage)
+ echo "Starting variant builds for ${machinedir}/${builder}..." &>> ${TMPFILE}
for variant in ${machinedir}/${builder}/variants/*; do
[[ -d ${variant} ]] || break
+ echo "Variant: ${variant}" &>> ${TMPFILE}
"${nspawn_command[@]}" --ephemeral --bind ${machinedir}/var/cache/binpkgs -M ${n} /root/bin/run-update ${variant##*/} &>> ${TMPFILE}
let "anyfail+=$?"
done
fi
done
+set +x
cp ${TMPFILE} /var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs/last-build.log
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/binhost:master commit in: builders/milou/
@ 2024-09-13 12:38 Andreas K. Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Hüttel @ 2024-09-13 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 65a152722a538bb861bda66a1ada076adf7863da
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 12:37:33 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 12:37:33 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=65a15272
Fix builder identification?
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/milou/binhost-update | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index 2f69534..bb95cf3 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -129,7 +129,7 @@ for n in ${NSPAWN_NAMES} ; do
ret=$?
let "anyfail+=${ret}"
if [[ ${ret} = 0 ]]; then
- builder=$(readlink ${machinedir}/etc/portage)
+ builder=$(readlink ${machinedir}/etc/binhost.this)/portage
echo "Starting variant builds for ${machinedir}/${builder}..." &>> ${TMPFILE}
for variant in ${machinedir}/${builder}/variants/*; do
[[ -d ${variant} ]] || break
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/binhost:master commit in: builders/milou/
@ 2024-09-13 12:44 Andreas K. Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Hüttel @ 2024-09-13 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 46e1127c985af3eac76c93781bc4e1a2741855da
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 12:44:09 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 12:44:09 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=46e1127c
One more fix
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/milou/binhost-update | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index bb95cf3..2688a56 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -129,7 +129,7 @@ for n in ${NSPAWN_NAMES} ; do
ret=$?
let "anyfail+=${ret}"
if [[ ${ret} = 0 ]]; then
- builder=$(readlink ${machinedir}/etc/binhost.this)/portage
+ builder=/etc/$(readlink ${machinedir}/etc/binhost.this)/portage
echo "Starting variant builds for ${machinedir}/${builder}..." &>> ${TMPFILE}
for variant in ${machinedir}/${builder}/variants/*; do
[[ -d ${variant} ]] || break
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/binhost:master commit in: builders/milou/
@ 2024-09-13 16:47 Eli Schwartz
0 siblings, 0 replies; 7+ messages in thread
From: Eli Schwartz @ 2024-09-13 16:47 UTC (permalink / raw
To: gentoo-commits
commit: f0d3daff9691933f6f41a14ee838c7914ecab2cb
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 16:46:49 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 16:46:49 2024 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=f0d3daff
ephemeral builds: make PKGDIR actually bind to the right place...
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
builders/milou/binhost-update | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index 2688a56..e64cd1e 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -134,7 +134,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 -M ${n} /root/bin/run-update ${variant##*/} &>> ${TMPFILE}
+ "${nspawn_command[@]}" --ephemeral --bind ${machinedir}/var/cache/binpkgs:/var/cache/binpkgs -M ${n} /root/bin/run-update ${variant##*/} &>> ${TMPFILE}
let "anyfail+=$?"
done
fi
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-09-13 16:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-07 12:37 [gentoo-commits] proj/binhost:master commit in: builders/milou/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2024-02-07 12:53 Andreas K. Hüttel
2024-02-29 11:29 Andreas K. Hüttel
2024-09-13 1:43 Eli Schwartz
2024-09-13 12:38 Andreas K. Hüttel
2024-09-13 12:44 Andreas K. Hüttel
2024-09-13 16:47 Eli Schwartz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox