From nobody Mon Dec 29 03:28:04 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 4dfhW90NVZz6LbNN for ; Mon, 29 Dec 2025 03:28:05 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfhW859T1z3v16 for ; Mon, 29 Dec 2025 03:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xo6n0LX4wbqmlDXP70vtnZr3orqfptmiWGSyKG7qs+k=; b=NKTLjf/x2LvhGLZPVa1NGYDEZSPEDZ6VK/JD/YFQv3YpYlZPdy9eHAXedpK5+rthS7lGFS M96XLwOs63IDlG0ZA+ZWzuaEKH0Ne7nTzJIQTpK4EBlO+iSjvcukfOakPcU9EevCoUcy87 87OZdXQJ4pJI1egrcIBDQoRk6Te07FzFqzF7TUvd+7TqzFB65vKL3PV/SwiOYQBhQyPRlg 3S/xTUORPEFT45F8CT4O2HXioc4AUBnTGBOCfz3/zt7wAbota9BD5yz5P9qoIZxyQuEoDe N+m5R2uLG+ExHEQ+PbNbs8SfJyrjmz/GejXOQUIN67kZWD6+IHRpZh0tE3qbrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xo6n0LX4wbqmlDXP70vtnZr3orqfptmiWGSyKG7qs+k=; b=oxWyhDfYB+Hyn2xXZ2BVIKdWG7a6Z2ZRxWyHCl2fdfSxG7V+JjOySPWl3uQW5fp1/R9JDk 1EO9tCIaUnNCcHHb2h+aqcU3cM/HYq5GrPuqAnsum9yrS0VvVVwtCmBO9CnrErM1BPAbuN +VzjA5wCGRnt6iUQNpYQZbAa/GqnrA68kcC9ARX2ogr6AEK4EKVomjBWdJNB6+rvPCEQmX hmhwEQsKE8lw7SqRTMoR3xHY81xIbhjw8GmrLSBwv+NupZes1bLEFSVky2Q+QwYCHqDxYi GKS7chLovppgvTIWMPzm4CmeWJwmHf8AwwGRJroqexRglJ7yxVVN827pTfvlaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766978884; a=rsa-sha256; cv=none; b=gz/w2gq6HUcE4BiE7CE45W+Kl86oSXQf4UC5N3Nc8ZIPaVDt5fl94u3MxvIo9nnNaFy2/E cXc6r/rIftEB2MtgYQ1klNNtkWMmZPcA0WqV4fyFQ3xniJhnaMBigXTYoGRKDo3tdxBDqI H73BPj/J/NgoBVCrWIK0BadJkalpBVZpDyK1fT/1PM4UYHv38+PAY+eCb6+RXhoW7i0shh y4dt/PfyGNCZg8o1bhJ68/rwYGzQdOgZ7KTUQYfIhR79hgNB8Abwe5yyJ358CDSlDBwL3C qSa9yhCXFI1lmUzE9A7tUMKYh+QupzyhSnTEYeNQSWFLiNot4tAvU9All4MKYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfhW84F02z1BmR for ; Mon, 29 Dec 2025 03:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c433 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 03:28:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Jorgensen From: Xin LI Subject: git: d1f275606d9f - stable/14 - 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d1f275606d9fa2560606c4b6e515bc35d82699fc Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 03:28:04 +0000 Message-Id: <6951f544.c433.1d7d12c5@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=d1f275606d9fa2560606c4b6e515bc35d82699fc commit d1f275606d9fa2560606c4b6e515bc35d82699fc Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:16 +0000 Commit: Xin LI CommitDate: 2025-12-29 03:22:18 +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. (cherry picked from commit fc83e6c5e1f20087314dc52b63e485db87a98b86) --- release/Makefile.gce | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 51dc5e3436e2..f67cc5da8d82 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -18,7 +18,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" @@ -76,7 +76,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}