iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix vsphere-iso acceptance tests (#9878) (#9881)

This commit is contained in:
Troy Lindsay 2020-09-03 03:17:49 -05:00 committed by GitHub
parent c492199ba5
commit 602729ac23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builder/vsphere/iso/builder_acc_test.go
View File

@ -43,7 +43,9 @@ func defaultConfig() map[string]interface{} {
"ssh_password": "jetbrains", "ssh_password": "jetbrains",
"vm_name": commonT.NewVMName(), "vm_name": commonT.NewVMName(),
"storage": map[string]interface{}{
"disk_size": 2048, "disk_size": 2048,
},
"communicator": "none", // do not start the VM without any bootable devices "communicator": "none", // do not start the VM without any bootable devices
} }
@ -338,7 +340,9 @@ func TestISOBuilderAcc_networkCard(t *testing.T) {
func networkCardConfig() string { func networkCardConfig() string {
config := defaultConfig() config := defaultConfig()
config["network_card"] = "vmxnet3" config["network_adapters"] = map[string]interface{}{
"network_card": "vmxnet3",
}
return commonT.RenderConfig(config) return commonT.RenderConfig(config)
} }
@ -422,10 +426,16 @@ func fullConfig() map[string]interface{} {
"host": "esxi-1.vsphere65.test", "host": "esxi-1.vsphere65.test",
"RAM": 512, "RAM": 512,
"disk_controller_type": "pvscsi", "disk_controller_type": []string{
"pvscsi",
},
"storage": map[string]interface{}{
"disk_size": 1024, "disk_size": 1024,
"disk_thin_provisioned": true, "disk_thin_provisioned": true,
},
"network_adapters": map[string]interface{}{
"network_card": "vmxnet3", "network_card": "vmxnet3",
},
"guest_os_type": "other3xLinux64Guest", "guest_os_type": "other3xLinux64Guest",
"iso_paths": []string{ "iso_paths": []string{
@ -550,7 +560,9 @@ func clusterDRSConfig() string {
config["cluster"] = "cluster2" config["cluster"] = "cluster2"
config["host"] = "" config["host"] = ""
config["datastore"] = "datastore3" // bug #183 config["datastore"] = "datastore3" // bug #183
config["network"] = "VM Network" // bug #183 config["network_adapters"] = map[string]interface{}{
"network": "VM Network",
}
return commonT.RenderConfig(config) return commonT.RenderConfig(config)
} }