Commit Graph

4 Commits

Author SHA1 Message Date
Glen Barber
e6d47b09e1 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
2015-07-02 16:17:05 +00:00
Glen Barber
548c6feef7 MFC r284780, r284811, r284812:
r284780:
  Ensure ASSUME_ALWAYS_YES is set when deleting pkg(8) from the
  DESTDIR, otherwise it can get stuck in ttyin.

 r284811:
  Consider PRERELEASE builds snapshots, in addition to CURRENT
  and STABLE.

 r284812:
  Change the hour:minute delimiter from ':' to '-', since
  the former is an invalid character in EC2 images.

Approved by:	re (glebius, insta-MFC)
Sponsored by:	The FreeBSD Foundation
2015-06-25 14:58:50 +00:00
Glen Barber
02b1ae96c2 MFC r284660, r284676:
r284660:
  Remove the Azure-local vm_extra_create_disk(), since we no longer
  need qemu-img to convert the final VHD image to an Azure-compatible
  format.

  Although the waagent utility is installed from ports, create the
  symlink to /usr/sbin, pending investigation on where this is
  hard-coded, so it can be reported upstream.

 r284676:
  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.

Sponsored by:	The FreeBSD Foundation
2015-06-24 18:56:28 +00:00
Glen Barber
25a080cf58 MFC r284567:
Add Makefile.azure, used to upload VHD images to the
  Microsoft Azure environment, similar to the EC2 AMIs.

Sponsored by:	The FreeBSD Foundation
2015-06-21 04:39:34 +00:00