Append the hour and minute to the snapshot suffix for EC2

AMIs and Azure VM images.  This is particularly helpful for
testing to avoid name collisions, but also useful for cases
where a necessary rebuild is done before the date changes.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-06-21 12:37:31 +00:00
parent 394613bfd5
commit e5f5cbd42c
2 changed files with 2 additions and 2 deletions

View File

@ -17,7 +17,7 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF} | awk -F' ' '{print $$2}
.endif .endif
.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
SNAPSHOT_DATE!= date +-%Y-%m-%d SNAPSHOT_DATE!= date +-%Y-%m-%d-%H:%M
.endif .endif
AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd

View File

@ -6,7 +6,7 @@
# #
.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE"
AMINAMESUFFIX!= date +-%Y-%m-%d AMINAMESUFFIX!= date +-%Y-%m-%d-%H:%M
.endif .endif
.if defined(EC2PUBLIC) .if defined(EC2PUBLIC)
PUBLISH= --public PUBLISH= --public