svn commit: r284968 - head/release

[Glen Barber]

Author: gjb
Date: Tue Jun 30 19:18:08 2015
New Revision: 284968
URL: https://svnweb.freebsd.org/changeset/base/284968

Log:
  Default the VAGRANT_VERSION to ${REVISION}-${BRANCH} if
  not set, which expands to '11.0-CURRENT', for example.
  
  If the branch is -CURRENT, -STABLE, or -PRERELEASE, suffix
  the VAGRANT_VERSION with the snapshot date.
  
  MFC after:	3 days
  X-MFC-Needs:	r284893, r284895, r284896, r284897, r284942
  Tested with:	head at r284961 (patched)
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile.vagrant

Modified: head/release/Makefile.vagrant
==============================================================================
--- head/release/Makefile.vagrant	Tue Jun 30 19:06:14 2015	(r284967)
+++ head/release/Makefile.vagrant	Tue Jun 30 19:18:08 2015	(r284968)
@@ -11,7 +11,7 @@ VAGRANT_UPLOAD_TGTS=	vagrant-check-depen
 CLEANFILES+=		${VAGRANT_UPLOAD_TGTS}
 
 .if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF)
-. for VAR in _KEY _USERNAME _VERSION
+. for VAR in _KEY _USERNAME
 VAGRANT${VAR}!=		grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F'	' '{print $$2}'
 ATLAS${VAR}:=		${VAGRANT${VAR}}
 . endfor
@@ -21,6 +21,8 @@ ATLAS${VAR}:=		${VAGRANT${VAR}}
 SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H-%M
 .endif
 
+VAGRANT_VERSION?=	${REVISION}-${BRANCH}${SNAPSHOT_DATE}
+
 VAGRANT_TARGET:=	${OSRELEASE}${SNAPSHOT_DATE}.box
 VAGRANT_PROVIDERS?=	vmware_desktop
 #VAGRANT_PROVIDERS+=	virtualbox
@@ -54,7 +56,7 @@ vagrant-do-package-vmware: vagrant-creat
 
 atlas-do-upload: vagrant-do-package-vmware
 .for PROVIDER in ${VAGRANT_PROVIDERS}
-	${.CURDIR}/scripts/atlas-upload.sh -b FreeBSD-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET} -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v 0.1
+	${.CURDIR}/scripts/atlas-upload.sh -b FreeBSD-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET} -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION}
 .endfor
 	touch ${.OBJDIR}/${.TARGET}