From nobody Tue Oct 03 17:28:41 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 4S0Ptd6Krmz4vm8D; Tue, 3 Oct 2023 17:28:41 +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 4S0Ptd2vQ3z4KZS; Tue, 3 Oct 2023 17:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696354121; 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=Z9MKB/gdkJkUmS+XINyuVuqApocKyYNmS3Gjb6TfGaU=; b=snLWxEuozdZ+wlE/FqbynU5dTSbMaxjLQTHLaUD7sd1njvK5DAi1dbEYM9yrM0k7EPXEKY ZCa/UIZXX4DhB8jzhJ2EqS/LtORk5B7/d+ptDukni5KlrUl3KQiccwEPhWkem/+TJJLPfb ugAhQuo87cIP1xSRqQGz7afvyJFeL8r/YBGRXjYAaIaDBmzxpBNdE34AYds7R6040WJrQC /pjzmNf36uhzhPnab+jKrSGq1XBgeqjq8DYvlkRwhEjXCbThEtXGUjPyvGNF0gf0MZ5dsx 49osTNo+0Q9S8GD1Hcaikir7HEiUiVqYEeFuh5ouAWr8x2Cnlvy8lHtCB2gP1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696354121; a=rsa-sha256; cv=none; b=ivok6vYSBmnRax4Zyyo4VUcQWU/lbRUc0QNJKvdiSYzam5UGyEBkL4s8RJTD29IqJXg3SI k6RU8QbTNhZxmWPWOlhfRKb8zdok7xKEwMk2qmmnDqleP+Rp+phNFQgV1GGMWrkfdoH5CG AXhHidzOTwtNcJ1RUsBfYG2KyB7/u+ZHkKqSLhrGmhP6BO/NNrK9gi0PkvDG/zJ6YXIuJp mT43WfeN5Up29MYxF4As/Z0Ke2IglfWBYWlFzdY6RT6qYVf7CHgG662WZHopbEYQszPrUH wgDF7K2hek26bwpW95EZ6IByd0pt93oWAbBJY1srx0U+XsTwtAzZOpWywgcxsg== 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=1696354121; 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=Z9MKB/gdkJkUmS+XINyuVuqApocKyYNmS3Gjb6TfGaU=; b=xaqy3XX+mVbyousnukIX/iNuA7Ri0m5yvVUnmaOc1gfdLROeV/D3gD8QaefBXwk6mCwm5S uDLtZ7r0ApX3Rx3z6toTJJfuOJdMBT9FR8lPbqDGHvewWmEJQrQRvlshZtiavTRqdUttRW En7X/GTL+I7ANqsnO+uAt+n3CWl0/L6YKp/gaudQ8tNYBYNbBJabrbNYoVABlFlqUHwSiu 4LatdDCsFIy5zbLnO32Tc37b75grG00kaP4OKPuHXHpuZ9thTSiwJezJQBqYTRu81rY0dO WAvUcr5PcPx+AbQAZVyEQIBkZmavpTXyDYu/1D7KsqyIOeI8sLf56al9/hnn5Q== 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 4S0Ptd1ybPz13Fl; Tue, 3 Oct 2023 17:28:41 +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 393HSf7T085575; Tue, 3 Oct 2023 17:28:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393HSfCb085572; Tue, 3 Oct 2023 17:28:41 GMT (envelope-from git) Date: Tue, 3 Oct 2023 17:28:41 GMT Message-Id: <202310031728.393HSfCb085572@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: a18905a9bfcc - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a18905a9bfccc962f67b8a6067e7cbd4eb2bba17 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a18905a9bfccc962f67b8a6067e7cbd4eb2bba17 commit a18905a9bfccc962f67b8a6067e7cbd4eb2bba17 Author: Colin Percival AuthorDate: 2023-09-09 00:51:57 +0000 Commit: Colin Percival CommitDate: 2023-10-03 17:28:18 +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". releng/14.0 candidate. Discussed with: gjb Reviewed by: imp MFC after: 5 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41791 (cherry picked from commit 7494fb6b7d809257d4eb9eff06ce226143f27add) --- 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