From nobody Sat Nov 15 14:50:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d7xky5WbXz6GQhp; Sat, 15 Nov 2025 14:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d7xky4dRzz3DVl; Sat, 15 Nov 2025 14:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763218234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AEpaSFCvN9ymKRwpadCQBimN/W/YY6PUzD2eepzLta4=; b=X32YZ6+9TYFkNKkEcrBu2SGVjZSw04W2Aa/sD9xTJI6aBKxPO5PZeTMke3th6WX43P9quW 1wLXaB4NDr+4Ic8stI07kQTT62o52szYXXeQiQ6qyuUt5QciUTxZuTTfiPYjNzkK8FXjfP ywonAd/DlKn2YuM4E/DnShvv/UPLvx+QhtJ6dP5yYop73lG8E2hk25YFXWmiwm5bfNf9xT 1uI61MGrzZfMxUpHId0M4Ei+K4CzJMGeOCbcYiT1Gzd1LkKXkVE9Kqk5pFTv6XuoHO9csV B/S6EmmdAvwO3VABVN45cUUFMt6L8M7dl5S+NBCUV99rf9i1MTyRuyaLycfX4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763218234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AEpaSFCvN9ymKRwpadCQBimN/W/YY6PUzD2eepzLta4=; b=d+OD0JdF65UL2l2hZ2SEEaCmiTdE8Dn8fUxmA3MWUZQI1+Q4SrrOlmfMgq3kUXnUnphxwC boi13SdcKAQ3CXvUtiSDDfOGwH4Hm/EPXTr8XCltuzk+B4g3ZlCoM5E0frv4uwRmTvC0fs DlgBIoXr6pmRNimO4m6s/knzeCLX3X3BGH78f+sL9p9kPnNmmWbSVDHRJr2oPGsg7q1e2P WbDy+jrGdf5gYTrdCje2SVNzU22/xNJLW9h1AQwl+fXQWs6hdSiBuWLztcnP2gv2guE/Nr w7/To/mshKToD/NUP7TSRoYVC1rfcY8F3xXYw3+isBvpDgTWq2kbsKGKsIr37Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763218234; a=rsa-sha256; cv=none; b=KJVtUxEnFK4x6rrz0kO5gASZZ6E32FP8zKwqUMFzVUnEElSEzN/TCixQ22Y7GRtvdNCfjJ ytUHcfQGOLJ4G2vDbDSvzNKO/IyFzQG9484EjcZHTAARCB3giuaI197WVxiAslanbRsXn0 PEeoW9dVMBPFFbYzV9Ww05ap2MK0fpKGZZtrVclM8H9xKJHM/BC7iDqGzqeTqAh6yk4YyD QqE4lMT7Igx3M28A54ywrAgzJi6rnxuQXQ85dbzYMQubfdiXMSW/ejuoz7pG3o0a3CSWT0 iQR1z1toKQiu3kVupeD2okwRd0ww8RPCBeRdqBNm/Y5rnESt/ZHusDU2HtXYtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d7xky48l2zxM3; Sat, 15 Nov 2025 14:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AFEoY8D095197; Sat, 15 Nov 2025 14:50:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFEoYwj095194; Sat, 15 Nov 2025 14:50:34 GMT (envelope-from git) Date: Sat, 15 Nov 2025 14:50:34 GMT Message-Id: <202511151450.5AFEoYwj095194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: fc83e6c5e1f2 - main - GCE: Add TARGET and FS to image family List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc83e6c5e1f20087314dc52b63e485db87a98b86 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fc83e6c5e1f20087314dc52b63e485db87a98b86 commit fc83e6c5e1f20087314dc52b63e485db87a98b86 Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:16 +0000 Commit: Colin Percival CommitDate: 2025-11-15 14:45:46 +0000 GCE: Add TARGET and FS to image family GCE image family is meant to be unique per set of image characteristics so that a user can create instances using the image family instead of the image name to reliably get a similar image with updated software, but no other changes. Without this change, the instances create API would select the most recent non-deprecated image matching the name, regardless of architecture or filesystem. --- release/Makefile.gce | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 06b76857ae88..a6d09de468c0 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -16,7 +16,7 @@ GCE_BUCKET?= GCE_LICENSE?= .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) -GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,} +GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,}-${TARGET} .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" @@ -74,7 +74,7 @@ gce-do-upload-${_FS}: /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET_${_FS}}.tar.gz \ gs://${GCE_BUCKET}/ /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ - --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ + --family=${GCE_FAMILY}-${_FS}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ --guest-os-features=GVNIC,UEFI_COMPATIBLE \ --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz touch ${.OBJDIR}/${.TARGET}