diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-06-27 23:03:28 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-06-27 23:03:28 +0000 |
| commit | 8c4b4cc3ba98fcbec2329f928515aab3e16c0cf5 (patch) | |
| tree | ce5534883e4ffd16f8f466bfe3fa4cadcc610ad1 /release/Makefile.vagrant | |
| parent | 02158ab01134bf2b9a4b7446ad80eb956a6c819a (diff) | |
| download | src-8c4b4cc3ba98fcbec2329f928515aab3e16c0cf5.tar.gz src-8c4b4cc3ba98fcbec2329f928515aab3e16c0cf5.zip | |
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
Notes
Notes:
svn path=/head/; revision=284897
Diffstat (limited to 'release/Makefile.vagrant')
| -rw-r--r-- | release/Makefile.vagrant | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index b8b7fb1d2162..c63ed973d4ed 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -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-create-vmware-vmx vagrant-do-package 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} |