From nobody Thu Oct 5 15:54:34 2023 X-Original-To: dev-commits-src-all@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 4S1bj675jfz4vs8Y; Thu, 5 Oct 2023 15:54:34 +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 4S1bj666KMz3Lhv; Thu, 5 Oct 2023 15:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696521274; 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=7IYMppSIl4VdMOuyXi0UNH05N3F3Q8eWCD7X+ZTm1gA=; b=h6EC/FdAH4DcK/8zUJ6XD0lFzbzOHUrY3U/+810Sy9c2gTCkB2LT0EZTXknygSmLiu9qBH HxhzDtQmyxOESSKbmgdG4pqC1QoOKis/m6W0XgEXA+i08uNEF6PdbCg/Go9Z8Sc5QhHdni VWSV47auOVw9Gdj0o/ssRnWKce0uQ9lMiJ8NMuaprh6Fv1vR00xlvmevdbIxxmaHKn+XtB DTfIQpbO+HVpNKuXEKjhLBYw6+Ex5rLqeV7DNZvW5EHnksH7Bs6cvUTddjccToe2sETQVy iz5sRMHrhoahMUHxPQS4QHTcT9HOkN0M/t7Iofc5hSdBvDgOJtPfi0Nib6bJCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696521274; a=rsa-sha256; cv=none; b=k/HmlFudCt9XJbslu0NyBvvhkU9CUXgpKQhlrb9NmALR+Lkz35KO3y04BaSqUn+SZGTCn7 kj15fCwV4OozcKPzIcj2TOj9NvSQ7yVvKDk1sMtpdIhCkX6+aQv/pY2TZNjZGGQ9aMJUFo DqUl3LkgwP/J5clPrHgX+14CuEfQdGILDpx+RdmkdkoUfNAtxsPg69H4XReHt5/2x4tqjb JddeKOwRuDi0rOI9a7FJ9syHM0+svRlj6HSerCvVlAC+z3qvX0vh64nOIz3QcYSfwJW3DM EIG5jUwdhBe9ZcSi7MNKbpWBEfxGiRI/TxiZfKdKXQ97oys80lbfNaVVychVog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696521274; 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=7IYMppSIl4VdMOuyXi0UNH05N3F3Q8eWCD7X+ZTm1gA=; b=sZ0ZR2oomR1bJTyjapiyCamXqfUSwnsI1n9p6JZ7G7mTMIVciKrLoVBaiubMTAf7r68pFT pD2gE03twYCs+DJSO1U5v6oxJUnFaTsajZWnuldyaSD2BrNpPA/XEl+BEIjUP0YoSn467e dH1UgA+DI+1AYlANdpWGzVGAzg7j48GjTu/gOUPncyFH3ArAuZha2HtioAMlrqajRR/rvQ J1nwV7rJHIxGC0z1OuYWPgJJF0q4Vz/wV8z1QW92fpx/vwuy7fBeKCGbDmxA8qoLdXBL0G qCo5sxpkrKqf0CX0qCOQ/npIhAEvjmkLmF6wru2JJBfIOU9tqZS/MyoDcJ6jSA== 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 4S1bj64zmFz1Qfp; Thu, 5 Oct 2023 15:54:34 +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 395FsYp5046710; Thu, 5 Oct 2023 15:54:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395FsYcb046707; Thu, 5 Oct 2023 15:54:34 GMT (envelope-from git) Date: Thu, 5 Oct 2023 15:54:34 GMT Message-Id: <202310051554.395FsYcb046707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c34cce0a2bae - releng/14.0 - EC2: Flavour existing AMIs as "base" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: c34cce0a2bae98ca1fcd1bba6c462f99e733d36b Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c34cce0a2bae98ca1fcd1bba6c462f99e733d36b commit c34cce0a2bae98ca1fcd1bba6c462f99e733d36b Author: Colin Percival AuthorDate: 2023-09-09 00:51:57 +0000 Commit: Colin Percival CommitDate: 2023-10-05 15:54:04 +0000 EC2: Flavour existing AMIs as "base" Using the recently-added "cloudware flavours" mechanism, turn the existing EC2 AMIs into a new "base" flavour. The only user-visible change is that AMI names now include the word "base". Approved by: re (gjb) Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41791 (cherry picked from commit 7494fb6b7d809257d4eb9eff06ce226143f27add) (cherry picked from commit a18905a9bfccc962f67b8a6067e7cbd4eb2bba17) --- release/Makefile.ec2 | 16 +++++++++------- release/Makefile.vm | 1 + release/tools/{ec2.conf => ec2-base.conf} | 0 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index b3f32d0e3efb..c674c967ff57 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -51,11 +51,12 @@ cw-ec2-portinstall: @touch ${.TARGET} .for _FS in ${EC2_FSLIST} +.for _FL in ${EC2_FLAVOURS:tl} .if defined(SSMPREFIX) && !empty(SSMPREFIX) -SSMOPTS_${_FS}= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/${_FS}/${REVISION}/${BRANCH} +SSMOPTS_${_FL}_${_FS}= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/${_FL}/${_FS}/${REVISION}/${BRANCH} .endif -EC2AMILIST+= ec2ami-${_FS} -ec2ami-${_FS}: cw-ec2-${_FS} ${CW_EC2_PORTINSTALL} +EC2AMILIST+= ec2ami-${_FL}-${_FS} +ec2ami-${_FL}-${_FS}: cw-ec2-${_FL}-${_FS} ${CW_EC2_PORTINSTALL} .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE}) @echo "--------------------------------------------------------------" @echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation" @@ -75,14 +76,15 @@ ec2ami-${_FS}: cw-ec2-${_FS} ${CW_EC2_PORTINSTALL} @false .endif /usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \ - ${EC2ARCH} ${SSMOPTS_${_FS}} ${BOOTMODEOPT} --sriov --ena \ - ${.OBJDIR}/${EC2${_FS:tu}IMAGE} \ - "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD} ${_FS:tu}" \ + ${EC2ARCH} ${SSMOPTS_${_FL}_${_FS}} ${BOOTMODEOPT} --sriov --ena \ + ${.OBJDIR}/${EC2-${_FL:tu}${_FS:tu}IMAGE} \ + "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD} ${_FL} ${_FS:tu}" \ "${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \ ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} \ ${EC2SNSTOPIC} ${EC2SNSREL} ${EC2SNSVERS} @touch ${.TARGET} .endfor +.endfor -ec2ami: ec2ami-${VMFS} +ec2ami: ec2ami-base-${VMFS} ec2amis: ${EC2AMILIST} diff --git a/release/Makefile.vm b/release/Makefile.vm index e7ff86c28df3..8828b99599e7 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -31,6 +31,7 @@ BASIC-CI_DESC= Image for CI EC2_FORMAT= raw EC2_FSLIST= ufs zfs EC2_DESC= Amazon EC2 image +EC2_FLAVOURS= BASE GCE_FORMAT= raw GCE_FSLIST= ufs GCE_DESC= Google Compute Engine image diff --git a/release/tools/ec2.conf b/release/tools/ec2-base.conf similarity index 100% rename from release/tools/ec2.conf rename to release/tools/ec2-base.conf