From nobody Sun Nov 16 03:12:01 2025 X-Original-To: dev-commits-src-branches@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 4d8GBV6RXSz6GpvK; Sun, 16 Nov 2025 03:12:02 +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 4d8GBV11Z7z3nCx; Sun, 16 Nov 2025 03:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262722; 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=766DZx/GJYUVND1Uz5txWohhNKec3EaJ8aj/9nC83rw=; b=ix2kG5oCi9PHA3hz8rJA8JTs9xz9BflJRH/ioovf+JDmkomeb9sZOm7H3kK+9RwUw4G8sD ZD8sWJQo7Y6oKyBikw0zklxCf332q1CA7bOBoVReyjpCtCja1e0rMKhKtBhI5JMeBsYEid pp5jxt0vcU4cZ1phNb0rDp03nbNfSUOT+0Vm2Ypdh/VciGdnd5nIU6XfNoqn0tyRcRblWo 56GoDL2qMBoT5BXmI1Y2B3xE8PCILvtvG5YqX3ZjWkIdtnj3cO+Gzkwt62YLgOaDTETUEf Bs/UqR02FWAdZaxLutfUZOjEWvhZRulrbteraKnb0VJY5v9oywqKQiUsTydSug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262722; 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=766DZx/GJYUVND1Uz5txWohhNKec3EaJ8aj/9nC83rw=; b=fsK944qoh7W4bgZpyoTEN+GrR62K3x5JjNSiDzde/ujp7rdc5Cuksb4xu1wl1j0U+wC0hZ 8K6V6bWY1ZyYEa2dhsRetcS+JTjwqWuGbem8VUv7vShSVCY/tnGjsY136tytisAaWPlDPn ptqNyaIUgSL5sIfwZ2qEEF3xsxOao1vu2lsoTP7q8pWg40ev4sAL+dw1aGps8Z4SZQ4b2s jtZ0+W8fdcU4n5P5S0d1jjt4gnNExz+autHldoxlF6wLDSQ7dqHmT434RiAimMyXWTo0i6 pQT9U96SsPPuHKMB4AFVBHev+ULSfkFwY/EWU3yedXupR5n0RO2CiTvyvT5B1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262722; a=rsa-sha256; cv=none; b=bPf3D/x4YbsEr9/ayC9erm6QA6PGNolPGXh40EDfWQDw7EAiw6QBYhhXaOXvtF78jR1Lr2 kLkGWmAtYHA4kcGoKNFs67q7rLVJfeubFdZZlFKs6wnc1JECa+MGyW/VoZcz0YDa7Eqpbo Wof2SXZzARDtCcMS23NaWHARO8h3Ojzkjhyn4HBmlvEHw5G/uYaY3aNnkxA81c68mFabZ5 z7ADQ1KzUo6qPC3W2JByV+75jcd3+rcDt2PMV9C3GntOYhoM4chJPtYiiNqd1X8iEnOMD9 6WcenZ8OGx/DdNOM8FVFsZbr98ycrz3877Cuf+WmOtNfwXPUw/iipnOnpA1uTA== 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 4d8GBV01Fmz4yy; Sun, 16 Nov 2025 03:12:02 +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 5AG3C1Er091635; Sun, 16 Nov 2025 03:12:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C1ZV091632; Sun, 16 Nov 2025 03:12:01 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:01 GMT Message-Id: <202511160312.5AG3C1ZV091632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 75ee49d2ed5f - releng/15.0 - GCE: Add TARGET and FS to image family List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 75ee49d2ed5fd904710071ebd4549a4eb506c547 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=75ee49d2ed5fd904710071ebd4549a4eb506c547 commit 75ee49d2ed5fd904710071ebd4549a4eb506c547 Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:16 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:03 +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. Approved by: re (cperciva) (cherry picked from commit fc83e6c5e1f20087314dc52b63e485db87a98b86) (cherry picked from commit 0005bb76e2e707f5ed39ca67beddb8a5d629c72e) --- 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}