From owner-svn-src-all@freebsd.org  Sat Jun 27 23:03:29 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0FA8E98E8C9;
 Sat, 27 Jun 2015 23:03:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 00A041308;
 Sat, 27 Jun 2015 23:03:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RN3SBT052703;
 Sat, 27 Jun 2015 23:03:28 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RN3SLm052702;
 Sat, 27 Jun 2015 23:03:28 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201506272303.t5RN3SLm052702@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 27 Jun 2015 23:03:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284897 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Jun 2015 23:03:29 -0000

Author: gjb
Date: Sat Jun 27 23:03:28 2015
New Revision: 284897
URL: https://svnweb.freebsd.org/changeset/base/284897

Log:
  Instead of hard-coding the PROVIDERS for upload, add the
  VAGRANT_PROVIDERS variable.  Right now, it defaults to only
  vmware_desktop, virtualbox support is to follow at some point.
  
  While here, fix the hashicorp URL: s/vagrant/atlas/, which
  was result of a sed(1) replace (and my fault).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile.vagrant

Modified: head/release/Makefile.vagrant
==============================================================================
--- head/release/Makefile.vagrant	Sat Jun 27 22:59:29 2015	(r284896)
+++ head/release/Makefile.vagrant	Sat Jun 27 23:03:28 2015	(r284897)
@@ -23,6 +23,8 @@ SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H-%M
 .endif
 
 VAGRANT_TARGET:=	${OSRELEASE}${SNAPSHOT_DATE}.box
+VAGRANT_PROVIDERS?=	vmware_desktop
+#VAGRANT_PROVIDERS+=	virtualbox
 
 vagrant-upload:		${VAGRANT_UPLOAD_TGTS}
 
@@ -52,8 +54,8 @@ vagrant-do-package-vmware: vagrant-creat
 	touch ${.OBJDIR}/${.TARGET}
 
 atlas-create-upload:
-.for PROVIDER in vmware_desktop virtualbox
-	/usr/local/bin/curl "https://vagrant.hashicorp.com/api/v1/box/${ATLAS_USERNAME}/${ATLAS_NAME}/version/${ATLAS_VERSION}/provider/${PROVIDER}/upload?access_token=${ATLAS_KEY}"
+.for PROVIDER in ${VAGRANT_PROVIDERS}
+	/usr/local/bin/curl "https://atlas.hashicorp.com/api/v1/box/${ATLAS_USERNAME}/${ATLAS_NAME}/version/${ATLAS_VERSION}/provider/${PROVIDER}/upload?access_token=${ATLAS_KEY}"
 .endfor
 	touch ${.OBJDIR}/${.TARGET}