Merge pull request #5631 from vijayinvites/diffdisks

[Hyper-V] Use differential disks and Inline disk creation to improve build time (a lot) and to reduce disk usage(a lot)

builder/hyperv/common/step_create_vm.go

@@ -29,6 +29,8 @@ type StepCreateVM struct {
 	EnableVirtualizationExtensions bool
 	AdditionalDiskSize             []uint
 	DifferencingDisk               bool
+	SkipExport                     bool
+	OutputDir                      string
 }
 
 func (s *StepCreateVM) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
@@ -52,6 +54,12 @@ func (s *StepCreateVM) Run(_ context.Context, state multistep.StateBag) multiste
 	}
 
 	vhdPath := state.Get("packerVhdTempDir").(string)
+
+	// inline vhd path if export is skipped
+	if s.SkipExport {
+		vhdPath = filepath.Join(s.OutputDir, "Virtual Hard Disks")
+	}
+
 	// convert the MB to bytes
 	ramSize := int64(s.RamSize * 1024 * 1024)
 	diskSize := int64(s.DiskSize * 1024 * 1024)

builder/hyperv/common/step_export_vm.go

@@ -18,18 +18,19 @@ const (
 type StepExportVm struct {
 	OutputDir      string
 	SkipCompaction bool
+	SkipExport     bool
 }
 
 func (s *StepExportVm) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
 	driver := state.Get("driver").(Driver)
 	ui := state.Get("ui").(packer.Ui)
-
 	var err error
 	var errorMsg string
 
 	vmName := state.Get("vmName").(string)
 	tmpPath := state.Get("packerTempDir").(string)
 	outputPath := s.OutputDir
+	expPath := s.OutputDir
 
 	// create temp path to export vm
 	errorMsg = "Error creating temp export path: %s"
@@ -40,21 +41,21 @@ func (s *StepExportVm) Run(_ context.Context, state multistep.StateBag) multiste
 		ui.Error(err.Error())
 		return multistep.ActionHalt
 	}
+	if !s.SkipExport {
+		ui.Say("Exporting vm...")
 
-	ui.Say("Exporting vm...")
-
-	err = driver.ExportVirtualMachine(vmName, vmExportPath)
-	if err != nil {
-		errorMsg = "Error exporting vm: %s"
-		err := fmt.Errorf(errorMsg, err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
+		err = driver.ExportVirtualMachine(vmName, vmExportPath)
+		if err != nil {
+			errorMsg = "Error exporting vm: %s"
+			err := fmt.Errorf(errorMsg, err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+		// copy to output dir
+		expPath = filepath.Join(vmExportPath, vmName)
 	}
 
-	// copy to output dir
-	expPath := filepath.Join(vmExportPath, vmName)
-
 	if s.SkipCompaction {
 		ui.Say("Skipping disk compaction...")
 	} else {
@@ -69,16 +70,17 @@ func (s *StepExportVm) Run(_ context.Context, state multistep.StateBag) multiste
 		}
 	}
 
-	ui.Say("Copying to output dir...")
-	err = driver.CopyExportedVirtualMachine(expPath, outputPath, vhdDir, vmDir)
-	if err != nil {
-		errorMsg = "Error exporting vm: %s"
-		err := fmt.Errorf(errorMsg, err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
+	if !s.SkipExport {
+		ui.Say("Copying to output dir...")
+		err = driver.CopyExportedVirtualMachine(expPath, outputPath, vhdDir, vmDir)
+		if err != nil {
+			errorMsg = "Error exporting vm: %s"
+			err := fmt.Errorf(errorMsg, err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
 	}
-
 	return multistep.ActionContinue
 }
 

builder/hyperv/iso/builder.go

@@ -94,6 +94,8 @@ type Config struct {
 
 	SkipCompaction bool `mapstructure:"skip_compaction"`
 
+	SkipExport bool `mapstructure:"skip_export"`
+
 	// Use differencing disk
 	DifferencingDisk bool `mapstructure:"differencing_disk"`
 
@@ -357,6 +359,8 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			EnableVirtualizationExtensions: b.config.EnableVirtualizationExtensions,
 			AdditionalDiskSize:             b.config.AdditionalDiskSize,
 			DifferencingDisk:               b.config.DifferencingDisk,
+			SkipExport:                     b.config.SkipExport,
+			OutputDir:                      b.config.OutputDir,
 		},
 		&hypervcommon.StepEnableIntegrationService{},
 
@@ -422,6 +426,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&hypervcommon.StepExportVm{
 			OutputDir:      b.config.OutputDir,
 			SkipCompaction: b.config.SkipCompaction,
+			SkipExport:     b.config.SkipExport,
 		},
 
 		// the clean up actions for each step will be executed reverse order

builder/hyperv/vmcx/builder.go

@@ -94,6 +94,8 @@ type Config struct {
 
 	SkipCompaction bool `mapstructure:"skip_compaction"`
 
+	SkipExport bool `mapstructure:"skip_export"`
+
 	ctx interpolate.Context
 }
 
@@ -469,6 +471,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&hypervcommon.StepExportVm{
 			OutputDir:      b.config.OutputDir,
 			SkipCompaction: b.config.SkipCompaction,
+			SkipExport:     b.config.SkipExport,
 		},
 
 		// the clean up actions for each step will be executed reverse order

website/source/docs/builders/hyperv-iso.html.md

@@ -97,6 +97,12 @@ can be configured for this builder.
 -   `disk_size` (number) - The size, in megabytes, of the hard disk to create
     for the VM. By default, this is 40 GB.
 
+-   `differencing_disk` (boolean) - If true enables differencing disks. Only the changes will be written to the new disk. This is especially useful if your
+    source is a vhd/vhdx. This defaults to false.
+
+-   `skip_export` (boolean) - If true skips VM export. If you are interested only in the vhd/vhdx files, you can enable this option. This will create
+    inline disks which improves the build performance. There will not be any copying of source vhds to temp directory. This defauls to false.
+    
 -   `enable_dynamic_memory` (boolean) - If true enable dynamic memory for virtual machine.
     This defaults to false.