git: 75ee49d2ed5f - releng/15.0 - GCE: Add TARGET and FS to image family

The branch releng/15.0 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=75ee49d2ed5fd904710071ebd4549a4eb506c547

commit 75ee49d2ed5fd904710071ebd4549a4eb506c547
Author:     Andrew Jorgensen <ajorgens@google.com>
AuthorDate: 2025-11-14 18:06:16 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
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}