aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'builders')
-rwxr-xr-xbuilders/milou/binhost-update39
-rw-r--r--builders/milou/fstab.inc18
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
+