From d4ee503af1898686df605c58d55fca9b657dbc32 Mon Sep 17 00:00:00 2001 From: Ian McLeod Date: Wed, 8 Jun 2016 09:10:45 -0500 Subject: [PATCH 1/2] expose Factory hyperv support in builder --- builder/kojid | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builder/kojid b/builder/kojid index 4ea93f2..b529006 100755 --- a/builder/kojid +++ b/builder/kojid @@ -3063,7 +3063,7 @@ class BaseImageTask(OzImageTask): Some image formats require others to be processed first, which is why we have to do this. raw files in particular may not be kept. """ - supported = ('raw', 'raw-xz', 'vmdk', 'qcow', 'qcow2', 'vdi', 'rhevm-ova', 'vsphere-ova', 'docker', 'vagrant-virtualbox', 'vagrant-libvirt', 'vagrant-vmware-fusion', 'vpc') + supported = ('raw', 'raw-xz', 'vmdk', 'qcow', 'qcow2', 'vdi', 'rhevm-ova', 'vsphere-ova', 'docker', 'vagrant-virtualbox', 'vagrant-libvirt', 'vagrant-vmware-fusion', 'vagrant-hyperv', 'vpc') for f in formats: if f not in supported: raise koji.ApplianceError('Invalid format: %s' % f) @@ -3099,6 +3099,7 @@ class BaseImageTask(OzImageTask): 'vagrant-virtualbox': self._buildOVA, 'vagrant-libvirt': self._buildOVA, 'vagrant-vmware-fusion': self._buildOVA, + 'vagrant-hyperv': self._buildOVA, 'docker': self._buildDocker } # add a handler to the logger so that we capture ImageFactory's logging @@ -3254,6 +3255,9 @@ class BaseImageTask(OzImageTask): # The initial disk image transform for VMWare Fusion/Workstation requires a "standard" VMDK # not the stream oriented format used for VirtualBox or regular VMWare OVAs img_opts['vsphere_vmdk_format'] = 'standard' + if format == 'vagrant-hyperv': + format = 'hyperv-ova' + img_opts['hyperv_ova_format'] = 'hyperv-vagrant' targ = self._do_target_image(self.base_img.base_image.identifier, format.replace('-ova', ''), img_opts=img_opts) targ2 = self._do_target_image(targ.target_image.identifier, 'OVA', -- 2.10.0