From 43ee099ee7576e10613db40a188bd980acb4520f Mon Sep 17 00:00:00 2001 From: Michael Kuzmin Date: Wed, 31 Oct 2018 01:10:57 +0300 Subject: [PATCH] pass vSphere credentials to tests --- clone/builder_acc_test.go | 14 ++++++++++++-- driver/driver_test.go | 14 ++++++++++++-- iso/builder_acc_test.go | 14 ++++++++++++-- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/clone/builder_acc_test.go b/clone/builder_acc_test.go index 652f9634a..8452692af 100644 --- a/clone/builder_acc_test.go +++ b/clone/builder_acc_test.go @@ -3,6 +3,7 @@ package clone import ( builderT "github.com/hashicorp/packer/helper/builder/testing" commonT "github.com/jetbrains-infra/packer-builder-vsphere/common/testing" + "os" "github.com/hashicorp/packer/packer" "testing" @@ -19,10 +20,19 @@ func TestCloneBuilderAcc_default(t *testing.T) { } func defaultConfig() map[string]interface{} { + username := os.Getenv("VSPHERE_USERNAME") + if username == "" { + username = "root" + } + password := os.Getenv("VSPHERE_PASSWORD") + if password == "" { + password = "jetbrains" + } + config := map[string]interface{}{ "vcenter_server": "vcenter.vsphere65.test", - "username": "root", - "password": "jetbrains", + "username": username, + "password": password, "insecure_connection": true, "template": "alpine", diff --git a/driver/driver_test.go b/driver/driver_test.go index e46729ad4..fc5007b88 100644 --- a/driver/driver_test.go +++ b/driver/driver_test.go @@ -2,6 +2,7 @@ package driver import ( "fmt" + "os" "testing" "time" "math/rand" @@ -11,10 +12,19 @@ import ( const TestHostName = "esxi-1.vsphere65.test" func newTestDriver(t *testing.T) *Driver { + username := os.Getenv("VSPHERE_USERNAME") + if username == "" { + username = "root" + } + password := os.Getenv("VSPHERE_PASSWORD") + if password == "" { + password = "jetbrains" + } + d, err := NewDriver(&ConnectConfig{ VCenterServer: "vcenter.vsphere65.test", - Username: "root", - Password: "jetbrains", + Username: username, + Password: password, InsecureConnection: true, }) if err != nil { diff --git a/iso/builder_acc_test.go b/iso/builder_acc_test.go index eb84e587b..552417883 100644 --- a/iso/builder_acc_test.go +++ b/iso/builder_acc_test.go @@ -7,6 +7,7 @@ import ( commonT "github.com/jetbrains-infra/packer-builder-vsphere/common/testing" "github.com/vmware/govmomi/vim25/types" "io/ioutil" + "os" "testing" ) @@ -20,10 +21,19 @@ func TestISOBuilderAcc_default(t *testing.T) { } func defaultConfig() map[string]interface{} { + username := os.Getenv("VSPHERE_USERNAME") + if username == "" { + username = "root" + } + password := os.Getenv("VSPHERE_PASSWORD") + if password == "" { + password = "jetbrains" + } + config := map[string]interface{}{ "vcenter_server": "vcenter.vsphere65.test", - "username": "root", - "password": "jetbrains", + "username": username, + "password": password, "insecure_connection": true, "host": "esxi-1.vsphere65.test",