mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-14 20:37:06 +00:00
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
This commit is contained in:
parent
e6eeac9b71
commit
7494fb6b7d
|
@ -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}
|
||||
|
|
|
@ -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 zfs
|
||||
GCE_DESC= Google Compute Engine image
|
||||
|
|
Loading…
Reference in a new issue