From nobody Wed Aug 9 22:45:18 2023 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 4RLlWM5pxwz4mPp6; Wed, 9 Aug 2023 22:45:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLlWL6x6mz4MND; Wed, 9 Aug 2023 22:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621119; 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=BrFi0P/DHwUGa2DTVuRHc7RlSlOnGDvGvG3aRtrprr8=; b=LfGNcH/dJGY0B2e+jNvOVftL9SITf24wtNGjZKT67TjQEkqx/685sS2xblkL0qPx0PShcK wqJzhh6bHr6srEgw0PjTu8Wne3hdj/MHflKy3x9/CUCMOVU19tUw1ZKYLfd2Sjo3PFvPzN 2ULxi26B6lCgruDZcIaSZGZ32JPPAUihu3GySSgTkfR/N8OK1/npAcBLET7AS1OLYu399b tlvNeIQoXIbUqTHZ/vqpw/mrrtHR/YF9YIi4dtvvsIopdWCW9DsPyBTK7HbAJUVsWcTYDZ CenmFJ3Q70vD9zF5s/O0CuqHuZ7P6goFhoFT0SEaIwIR3jcrXvunKtOYJVNZeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621119; 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=BrFi0P/DHwUGa2DTVuRHc7RlSlOnGDvGvG3aRtrprr8=; b=V8v4aHxxt9X52qvKLGBAQR4Zg1tuIhYl0Guq10/l7SKc9t5gHGbif1FueMpEoFGBJ6lvkv NRa0WZ7TRPKL6E/g3Y51nttngToPfhY7yWW/O35l/YOOu7dG9vZLBWQZ8t4rMGSkNtMHyU mz2EqgbyP/32smQ3MFaGZUr150GKCziWTm/1mPQ2IORz+M6GNWD+gcMrkbFPcPv6qHVXnZ SKt9qfMg0CXpPRo0c8CVerLMxTafPf/QJARfXvVJ9eaqnM5qg965hNpKXj9UcgI8X2bhAm 0lXHcWKGAzLWUIhkJU3d+nU65UCATeMF5+9QHXl4DG8lNwuVGB/0cWUtR/qcOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691621119; a=rsa-sha256; cv=none; b=wY1L1g8xq//V+PcoEdm1cpUR2ehINOo/zsMivHfO+G5c9s1a4/WvmcH/deWOR6cYJtl6x3 JG0Ddzbf44sIxUbP7Ra5Ud7G2ZYDvdq9OGcB0WyHHHJGUDKOXmv1bLhxbJJ3HX/9ISrg6W a95Yvga7vdjj8mcv0QdfLmfH/H35991nFfr78dzq/7kqwD2dC7zGvOczYMNkz38jlqqcZR 90TOVD5ETakwmdrkA69TrApDDi3X5yvOO3xrSivbveYy71K0SEePQyMqYDQqb4uM9pc+Py H19P944Tfu4Y5gpNIsFcAtBu89/kT9kyxhrM70wXi3ou9HWHWiClCXFOolrurg== 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 4RLlWL5lldzYVV; Wed, 9 Aug 2023 22:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379MjIBN058646; Wed, 9 Aug 2023 22:45:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379MjIEu058643; Wed, 9 Aug 2023 22:45:18 GMT (envelope-from git) Date: Wed, 9 Aug 2023 22:45:18 GMT Message-Id: <202308092245.379MjIEu058643@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: 4c9c9b4b7480 - main - EC2: Respect ${VMFS} 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 4c9c9b4b7480b8a0bc40451bc15b2bacd7aba356 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4c9c9b4b7480b8a0bc40451bc15b2bacd7aba356 commit 4c9c9b4b7480b8a0bc40451bc15b2bacd7aba356 Author: Colin Percival AuthorDate: 2023-08-07 01:55:37 +0000 Commit: Colin Percival CommitDate: 2023-08-09 22:44:54 +0000 EC2: Respect ${VMFS} Prior to this commit, ${VMFS} controlled the filesystem used for building EC2 images, but the AMIs were recorded with SSM Parameter paths which indicated that they were UFS. This commit (a) uses ${VMFS} in the SSM parameter path instead of a hard-coded "ufs", and (b) adds the filesystem to the AMI name. Reviewed by: gjb Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41342 --- release/Makefile.ec2 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index e26f4f705cc6..bedc0b6221ad 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -19,7 +19,7 @@ EC2SNSREL= ${REVISION}-${BRANCH} EC2SNSVERS= ${GITBRANCH}@${GITREV} .endif .if defined(SSMPREFIX) && !empty(SSMPREFIX) -SSMOPTS= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/ufs/${REVISION}/${BRANCH} +SSMOPTS= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/${VMFS}/${REVISION}/${BRANCH} .endif .if ${TARGET_ARCH} != "amd64" EC2ARCH= --${TARGET_ARCH:S/aarch64/arm64/} @@ -54,7 +54,7 @@ cw-ec2-portinstall: .endif @touch ${.TARGET} -ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL} +ec2ami-${VMFS}: cw-ec2-${VMFS} ${CW_EC2_PORTINSTALL} .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE}) @echo "--------------------------------------------------------------" @echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation" @@ -76,8 +76,10 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL} /usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \ ${EC2ARCH} ${SSMOPTS} ${BOOTMODEOPT} --sriov --ena \ ${.OBJDIR}/ec2.raw \ - "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD}" \ + "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD} ${VMFS:tu}" \ "${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \ ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} \ ${EC2SNSTOPIC} ${EC2SNSREL} ${EC2SNSVERS} @touch ${.TARGET} + +ec2ami: ec2ami-${VMFS}