Date: Wed, 9 Aug 2023 22:45:18 GMT
From: Colin Percival <cperciva@FreeBSD.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject: git: 4c9c9b4b7480 - main - EC2: Respect ${VMFS}
Message-ID: <202308092245.379MjIEu058643@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4c9c9b4b7480b8a0bc40451bc15b2bacd7aba356 commit 4c9c9b4b7480b8a0bc40451bc15b2bacd7aba356 Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2023-08-07 01:55:37 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308092245.379MjIEu058643>