Remove variables previously used to test that stembuild would forcefu…

…lly log out a user
cloudfoundry · Nov 23, 2024 · 0191ac9 · 0191ac9
1 parent 5fe2108
commit 0191ac9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 31 deletions.
diff --git a/.envrc.template b/.envrc.template
@@ -27,8 +27,6 @@ export EXISTING_VM_IP=
 # export SUBNET_MASK=
 # export VM_NAME_PREFIX=
 # export VM_FOLDER=
-# export LOGOUT_INTEGRATION_TEST_VM_IP
-# export LOGOUT_INTEGRATION_TEST_VM_INVENTORY_PATH
 
 # If using a local OVA file, provide OVA_FILE
 # export OVA_FILE=/tmp/1709.ova

diff --git a/integration/construct/construct_suite_test.go b/integration/construct/construct_suite_test.go
@@ -43,8 +43,6 @@ const (
 	vcenterStembuildPasswordVariable  = "VCENTER_PASSWORD"
 	StembuildVersionVariable          = "STEMBUILD_VERSION"
 	VmSnapshotName                    = "integration-test-snapshot"
-	LoggedInVmIpVariable              = "LOGOUT_INTEGRATION_TEST_VM_IP"
-	LoggedInVmIpathVariable           = "LOGOUT_INTEGRATION_TEST_VM_INVENTORY_PATH"
 	powershell                        = "C:\\Windows\\System32\\WindowsPowerShell\\V1.0\\powershell.exe"
 )
 
@@ -60,20 +58,18 @@ var (
 )
 
 type config struct {
-	TargetIP           string
-	NetworkGateway     string
-	SubnetMask         string
-	VMUsername         string
-	VMPassword         string
-	VMName             string
-	VMNetwork          string
-	VCenterURL         string
-	VCenterCACert      string
-	VCenterUsername    string
-	VCenterPassword    string
-	VMInventoryPath    string
-	LoggedInVMIP       string
-	LoggedInVMIpath    string
+	TargetIP        string
+	NetworkGateway  string
+	SubnetMask      string
+	VMUsername      string
+	VMPassword      string
+	VMName          string
+	VMNetwork       string
+	VCenterURL      string
+	VCenterCACert   string
+	VCenterUsername string
+	VCenterPassword string
+	VMInventoryPath string
 }
 
 var _ = SynchronizedBeforeSuite(func() []byte {
@@ -88,8 +84,6 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	targetVMIP := envMustExist(TargetVmIPVariable)
 	vmName := envMustExist(VMNameVariable)
 
-	loggedInVmIp := envMustExist(LoggedInVmIpVariable)
-	loggedInVmInventoryPath := envMustExist(LoggedInVmIpathVariable)
 	vCenterUrl := envMustExist(vcenterBaseURLVariable)
 	vcenterFolder := envMustExist(vcenterFolderVariable)
 	vmInventoryPath := strings.Join([]string{vcenterFolder, vmName}, "/")
@@ -115,17 +109,15 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	Expect(err).NotTo(HaveOccurred())
 
 	conf = config{
-		TargetIP:           targetVMIP,
-		VMUsername:         vmUsername,
-		VMPassword:         vmPassword,
-		VCenterCACert:      pathToCACert,
-		VCenterURL:         vCenterUrl,
-		VCenterUsername:    vCenterStembuildUser,
-		VCenterPassword:    vCenterStembuildPassword,
-		LoggedInVMIP:       loggedInVmIp,
-		LoggedInVMIpath:    loggedInVmInventoryPath,
-		VMName:             vmName,
-		VMInventoryPath:    vmInventoryPath,
+		TargetIP:        targetVMIP,
+		VMUsername:      vmUsername,
+		VMPassword:      vmPassword,
+		VCenterCACert:   pathToCACert,
+		VCenterURL:      vCenterUrl,
+		VCenterUsername: vCenterStembuildUser,
+		VCenterPassword: vCenterStembuildPassword,
+		VMName:          vmName,
+		VMInventoryPath: vmInventoryPath,
 	}
 
 	enableWinRM()