diff options
author | gjb <gjb@FreeBSD.org> | 2015-07-02 16:17:05 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2015-07-02 16:17:05 +0000 |
commit | 6c9b1bee2d67c05c5bd0066aa73af98a34964afb (patch) | |
tree | e43943fc9c18cb293b374bbfc21ddcaf374f6965 /release/Makefile.ec2 | |
parent | 5daf218e81467da2c3e933c0414219081e74b9d7 (diff) | |
download | FreeBSD-src-6c9b1bee2d67c05c5bd0066aa73af98a34964afb.zip FreeBSD-src-6c9b1bee2d67c05c5bd0066aa73af98a34964afb.tar.gz |
MFC r284893, r284895-r284897, r284942, r284968, r284996, r285005:
r284893 (brd):
Add initial support for building Vagrant images for VMWare.
Next steps will be adding Virtualbox support and uploading
to Hashicorp Atlas for others to consume.
r284895:
Add default VAGRANT_IMG variable.
r284896:
Remove _ACCOUNT and add _USERNAME, _NAME, _VERSION for the
VAGRANT_${VAR} variables extracted from VAGRANT_UPLOAD_CONF.
Set ATLAS_${VAR} to VAGRANT_${VAR} if VAGRANT_UPLOAD_CONF
is set. There is intent to intentionally have separate
variants of configuration entries, but the defaults do not
yet have any reason to be different.
r284897:
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).
r284942 (brd):
Add Support for uploading Vagrant images to Hashicorp Atlas.
r284968:
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.
r284996:
Fix the gcloud port/package name.
r285005:
Remove the HH-MM suffix from the build date suffix.
It was useful when working out several kinks when testing
automated image uploading when retrying was necessary, but
now it is making things much too messy.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/Makefile.ec2')
-rw-r--r-- | release/Makefile.ec2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index f0b4459..2695183 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -6,7 +6,7 @@ # .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE" -AMINAMESUFFIX!= date +-%Y-%m-%d-%H-%M +AMINAMESUFFIX!= date +-%Y-%m-%d .endif .if defined(EC2PUBLIC) PUBLISH= --public |