Merge branch 'hotfix/rearrange_vmx_cleanup' of https://github.com/israelshirk/packer into b-2709

builder/vmware/iso/builder.go

@@ -286,6 +286,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Timeout: b.config.ShutdownTimeout,
 		},
 		&vmwcommon.StepCleanFiles{},
+		&vmwcommon.StepCompactDisk{
+			Skip: b.config.SkipCompaction,
+		},
 		&vmwcommon.StepConfigureVMX{
 			CustomData: b.config.VMXDataPost,
 			SkipFloppy: true,
@@ -294,9 +297,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&StepUploadVMX{
 			RemoteType: b.config.RemoteType,
 		},
-		&vmwcommon.StepCompactDisk{
-			Skip: b.config.SkipCompaction,
-		},
 		&StepExport{
 			Format: b.config.Format,
 		},

builder/vmware/vmx/builder.go

@@ -108,14 +108,14 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Timeout: b.config.ShutdownTimeout,
 		},
 		&vmwcommon.StepCleanFiles{},
+		&vmwcommon.StepCompactDisk{
+			Skip: b.config.SkipCompaction,
+		},
 		&vmwcommon.StepConfigureVMX{
 			CustomData: b.config.VMXDataPost,
 			SkipFloppy: true,
 		},
 		&vmwcommon.StepCleanVMX{},
-		&vmwcommon.StepCompactDisk{
-			Skip: b.config.SkipCompaction,
-		},
 	}
 
 	// Run the steps.