From nobody Wed Aug 09 22:45:19 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 4RLlWN2Ch8z4mPt6; Wed, 9 Aug 2023 22:45:20 +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 4RLlWN0Xgkz4MJQ; Wed, 9 Aug 2023 22:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621120; 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=bjUqrVHOFQ1vtfJ//gG4VCgH0KglVe5JM4byoqLrN8I=; b=YJ2RL6jlLrlX2zu2nhSI7QOmnKxDFlWZ4rWwo9uZM8IbbnDfI7q1tBS+mW89rM4bQnvyYe gy1Z+D3PeCwM2iGVpt+Y58Kv02PJGPAJIAlV7u/AY27ee1M8QsG4GX/Cuzqxzdje4N/FO2 s7HmMRspeUYV+vK1QTwElV2Xb1UMmXpaeAkKdygHeZ8PKNRlVQubnUOVNCdEx23UwR/Tty SaiQcC0S2jYmpeKrvlmTp3Gk+ejuIzriTEdqz1xeuWNCn4w8yqGSm02fEoTd2hZcYWjW/L 1WriHj9E5wpP8fpbEGneKrB9emfiwxHuOdxeaCF/Mh/n7Iq0I8wqGRmGQ3pbdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621120; 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=bjUqrVHOFQ1vtfJ//gG4VCgH0KglVe5JM4byoqLrN8I=; b=TO9b6N2ObScotisLwrvueYeb2OTSVtzD0uCdyspEHXE7WUfHiLt7yBBcfwHoftwgaXg83e +GecDI48tIK8qxrc9J0zLp6p3kht0Q/JVOEMhFUsCMKbTSjAn5pB+KOFVnLnEBjpIDSlLt 2MVeb8519GT8181xzmFWq0tlkhdqys1GXPgkr0FzGOpSZHbxmTtIo8C61+RGnqWTOT7Wmf LkEKAirXqzMa128iBfOz01vhUrFFosm9bB0fim08uTCJ3SK42BFgD9Gn9y1pnMXC0x6Wsa MKB10MgsAMPX9hSGv7mgchtGKO19C988/CCeTbNfymHDreA0EhypULazHaCuCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691621120; a=rsa-sha256; cv=none; b=MabEKYjc9Y/5xf68ZNDFtnRr1vSQBcCE28sHbitgTNAgGEl+3S/w4OcEqVQlHlKbdUXNHl N8FoKRJEqiDBRxGXm0+JbJO/xwo6/3IUSYZiCFwzOZjLlb5KraIU7f7MC29wyhaWJYKUN5 0D9FhvFJHIVosi5IQPkwDVFDOmKmUMkxy/X9fDg4kPRNdoUNr3nCLoJ+1Pxcx6jp1rM4bU NZzLVs+STRntOuR0CLb5jixMdDjSkupgU0Jn7vVj66lzq8r/oN32HR/cIH44cdq2z6O6LZ dY4VEJ2fecJNEg0SeomiJRVIMZiwE+SUrZWf12RTHAR/+ER5uCPJtQUMTSkJ5Q== 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 4RLlWM6lZjzYdV; Wed, 9 Aug 2023 22:45:19 +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 379MjJ56058709; Wed, 9 Aug 2023 22:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379MjJfA058707; Wed, 9 Aug 2023 22:45:19 GMT (envelope-from git) Date: Wed, 9 Aug 2023 22:45:19 GMT Message-Id: <202308092245.379MjJfA058707@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: 219caac69a2a - main - EC2: Build and upload AMIs for both UFS and ZFS 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: 219caac69a2a620086baa13b0663ac1ae2203451 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=219caac69a2a620086baa13b0663ac1ae2203451 commit 219caac69a2a620086baa13b0663ac1ae2203451 Author: Colin Percival AuthorDate: 2023-08-07 01:56:18 +0000 Commit: Colin Percival CommitDate: 2023-08-09 22:44:54 +0000 EC2: Build and upload AMIs for both UFS and ZFS The pre-existing "ec2ami" target builds and uploads a single AMI (with filesystem determined by ${VMFS}) as before; a new "ec2amis" target does both UFS and ZFS. Reviewed by: gjb Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41343 --- release/Makefile.ec2 | 18 +++++++++++------- release/Makefile.vm | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index bedc0b6221ad..eeea35eac213 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -18,9 +18,6 @@ PUBLICSNAP= --publicsnap EC2SNSREL= ${REVISION}-${BRANCH} EC2SNSVERS= ${GITBRANCH}@${GITREV} .endif -.if defined(SSMPREFIX) && !empty(SSMPREFIX) -SSMOPTS= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/${VMFS}/${REVISION}/${BRANCH} -.endif .if ${TARGET_ARCH} != "amd64" EC2ARCH= --${TARGET_ARCH:S/aarch64/arm64/} .endif @@ -54,7 +51,12 @@ cw-ec2-portinstall: .endif @touch ${.TARGET} -ec2ami-${VMFS}: cw-ec2-${VMFS} ${CW_EC2_PORTINSTALL} +.for _FS in ${EC2_FSLIST} +.if defined(SSMPREFIX) && !empty(SSMPREFIX) +SSMOPTS_${_FS}= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/${_FS}/${REVISION}/${BRANCH} +.endif +EC2AMILIST+= ec2ami-${_FS} +ec2ami-${_FS}: cw-ec2-${_FS} ${CW_EC2_PORTINSTALL} .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE}) @echo "--------------------------------------------------------------" @echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation" @@ -74,12 +76,14 @@ ec2ami-${VMFS}: cw-ec2-${VMFS} ${CW_EC2_PORTINSTALL} @false .endif /usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \ - ${EC2ARCH} ${SSMOPTS} ${BOOTMODEOPT} --sriov --ena \ - ${.OBJDIR}/ec2.raw \ - "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD} ${VMFS:tu}" \ + ${EC2ARCH} ${SSMOPTS_${_FS}} ${BOOTMODEOPT} --sriov --ena \ + ${.OBJDIR}/${EC2${_FS:tu}IMAGE} \ + "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD} ${_FS:tu}" \ "${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \ ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} \ ${EC2SNSTOPIC} ${EC2SNSREL} ${EC2SNSVERS} @touch ${.TARGET} +.endfor ec2ami: ec2ami-${VMFS} +ec2amis: ${EC2AMILIST} diff --git a/release/Makefile.vm b/release/Makefile.vm index a76e78a20f21..17c79a214af9 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -33,7 +33,7 @@ BASIC-CI_FSLIST= ufs BASIC-CI_DESC= Image for CI BASIC-CI_DISK= ${OSRELEASE}.${BASIC-CI_FORMAT} EC2_FORMAT= raw -EC2_FSLIST= ufs +EC2_FSLIST= ufs zfs EC2_DESC= Amazon EC2 image EC2_DISK= ${OSRELEASE}.${EC2_FORMAT} GCE_FORMAT= raw