From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C39E8158041 for ; Thu, 29 Feb 2024 11:29:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE201E29D0; Thu, 29 Feb 2024 11:29:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D14B7E29D0 for ; Thu, 29 Feb 2024 11:29:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFD79343078 for ; Thu, 29 Feb 2024 11:29:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A0D814BE for ; Thu, 29 Feb 2024 11:29:12 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1709206135.1cc6bee3495b17e64c1711d4e8decbdeb5a4a856.dilfridge@gentoo> Subject: [gentoo-commits] proj/binhost:master commit in: builders/milou/ X-VCS-Repository: proj/binhost X-VCS-Files: builders/milou/binhost-update builders/milou/fstab.inc X-VCS-Directories: builders/milou/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 1cc6bee3495b17e64c1711d4e8decbdeb5a4a856 X-VCS-Branch: master Date: Thu, 29 Feb 2024 11:29:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 64cf3f2b-76f7-473e-b520-f4239a7489c2 X-Archives-Hash: a67bfd5464165941eab4af0c30fa2f6c commit: 1cc6bee3495b17e64c1711d4e8decbdeb5a4a856 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Feb 29 11:26:05 2024 +0000 Commit: Andreas K. Hüttel gentoo 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 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 +