stembuild: move integration-ish iaas_cli tests to integration

- some tests under iaas_cli/ can be run locally but not when mixed with
  specs which require access to vCenter or similar setup
- moves tests which require external resources under
  integration/iaas_cli/
- moves test-contract-stembuild-linux task testing into integration task

Author: aramprice

ci/tasks/test-contract-stembuild-linux/run.sh

@@ -23,6 +23,9 @@ VM_NAME=$(cat integration-vm-name/name)
 
 echo "Using Existing VM IP/Name: ${TARGET_VM_IP}/${VM_NAME}"
 
+echo "install vcsim for vCenter manager and client contract integration tests"
+go -C govmomi/vcsim install
+
 pushd "${ROOT_DIR}/stemcell-builder/stembuild"
   echo '***Test Stembuild Code***'
   make integration

ci/tasks/test-contract-stembuild-linux/task.yml

@@ -34,10 +34,7 @@ clean :
 	rm -rf assets/StemcellAutomation.zip out/*
 
 units : stubbed-stemcell-automation-zip
-	go run github.com/onsi/ginkgo/v2/ginkgo run -r --randomize-all --randomize-suites --keep-going --skip-package integration,iaas_cli
-
-iaas_cli :
-	go run github.com/onsi/ginkgo/v2/ginkgo run -r --randomize-all --randomize-suites --keep-going --flake-attempts 2 iaas_cli
+	go run github.com/onsi/ginkgo/v2/ginkgo run -r --randomize-all --randomize-suites --keep-going --skip-package integration
 
 integration : stubbed-stemcell-automation-zip
 	go run github.com/onsi/ginkgo/v2/ginkgo run -r --timeout 3h -vv --randomize-all --keep-going --flake-attempts 2 integration

ci/tasks/test-contract-stembuild-windows/run.ps1

@@ -1,8 +1,6 @@
 package iaas_cli_test
 
 import (
-	"fmt"
-	"os"
 	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -13,18 +11,3 @@ func TestIaasCli(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "IaasCli Suite")
 }
-
-var targetVMPath string
-var vCenterCredentialUrl string
-
-var _ = BeforeSuite(func() {
-	vCenterCredentialUrl = os.Getenv("VCENTER_ADMIN_CREDENTIAL_URL")
-	Expect(vCenterCredentialUrl).NotTo(Equal(""), "VCENTER_ADMIN_CREDENTIAL_URL is required")
-
-	vmFolder := os.Getenv("VM_FOLDER")
-	Expect(vmFolder).NotTo(Equal(""), "VM_FOLDER is required")
-	vmName := os.Getenv("PACKAGE_TEST_VM_NAME")
-	Expect(vmName).NotTo(Equal(""), "PACKAGE_TEST_VM_NAME is required")
-
-	targetVMPath = fmt.Sprintf("%s/%s", vmFolder, vmName)
-})

ci/tasks/test-contract-stembuild-windows/task.yml

@@ -1,97 +1,13 @@
 package iaas_clients
 
 import (
-	"context"
-	"fmt"
-	"os"
 	"testing"
-	"time"
 
-	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/vmware/govmomi/object"
-
-	vcenterclientfactory "github.com/cloudfoundry/bosh-windows-stemcell-builder/stembuild/iaas_cli/iaas_clients/vcenter_manager"
 )
 
 func TestIaasClients(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "IaasClients Suite")
 }
-
-const (
-	VcenterUrl      = "VCENTER_BASE_URL"
-	VcenterUsername = "VCENTER_USERNAME"
-	VcenterPassword = "VCENTER_PASSWORD"
-	VcenterCACert   = "VCENTER_CA_CERT"
-	VmFolder        = "VM_FOLDER"
-	TestVmName      = "CONTRACT_TEST_VM_NAME"
-	TestVmPassword  = "CONTRACT_TEST_VM_PASSWORD"
-	TestVmUsername  = "CONTRACT_TEST_VM_USERNAME"
-)
-
-var TestVmPath string
-var VM *object.VirtualMachine
-var CTX context.Context
-var _ = BeforeSuite(func() {
-
-	managerFactory := &vcenterclientfactory.ManagerFactory{Config: vcenterclientfactory.FactoryConfig{
-		VCenterServer: envMustExist(VcenterUrl),
-		Username:      envMustExist(VcenterUsername),
-		Password:      envMustExist(VcenterPassword),
-		ClientCreator: &vcenterclientfactory.ClientCreator{},
-		FinderCreator: &vcenterclientfactory.GovmomiFinderCreator{},
-	},
-	}
-
-	CTX = context.TODO()
-
-	vCenterManager, err := managerFactory.VCenterManager(CTX)
-	Expect(err).ToNot(HaveOccurred())
-
-	err = vCenterManager.Login(CTX)
-	Expect(err).ToNot(HaveOccurred())
-
-	vmFolder := envMustExist(VmFolder)
-	testVmName := envMustExist(TestVmName)
-	testVmPath := fmt.Sprintf("%s/%s", vmFolder, testVmName)
-
-	vmToClone, err := vCenterManager.FindVM(CTX, testVmPath)
-	Expect(err).ToNot(HaveOccurred())
-
-	TestVmPath = testVmPath + fmt.Sprintf("%s", uuid.New())[0:8] //nolint:staticcheck
-
-	err = vCenterManager.CloneVM(CTX, vmToClone, TestVmPath)
-	Expect(err).ToNot(HaveOccurred())
-
-	time.Sleep(30 * time.Second)
-
-	VM, err = vCenterManager.FindVM(CTX, TestVmPath)
-	Expect(err).ToNot(HaveOccurred())
-
-})
-
-var _ = AfterSuite(func() {
-
-	if VM != nil {
-		task, err := VM.PowerOff(CTX)
-		Expect(err).ToNot(HaveOccurred())
-		err = task.WaitEx(CTX)
-		Expect(err).ToNot(HaveOccurred())
-
-		task, err = VM.Destroy(CTX)
-		Expect(err).ToNot(HaveOccurred())
-		err = task.WaitEx(CTX)
-		Expect(err).ToNot(HaveOccurred())
-	}
-})
-
-func envMustExist(variableName string) string {
-	result := os.Getenv(variableName)
-	if result == "" {
-		Fail(fmt.Sprintf("%s must be set", variableName))
-	}
-
-	return result
-}

ci/tasks/test-integration-stembuild-linux/run.sh

@@ -1,12 +1,7 @@
 package vcenter_manager_test
 
 import (
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
 	"testing"
-	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -16,36 +11,3 @@ func TestVcenterManager(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "VcenterManager Suite")
 }
-
-var (
-	CertPath string
-	cmd      *exec.Cmd
-	keyPath  string
-)
-
-var _ = BeforeSuite(func() {
-
-	if runtime.GOOS != "windows" {
-		workingDir, err := os.Getwd()
-		Expect(err).NotTo(HaveOccurred())
-		CertPath = filepath.Join(workingDir, "..", "fixtures", "dummycert")
-		keyPath = filepath.Join(workingDir, "..", "fixtures", "dummykey")
-
-		vcsimBinary := filepath.Join(os.Getenv("GOPATH"), "bin", "vcsim")
-
-		cmd = exec.Command(vcsimBinary, "-tlscert", CertPath, "-tlskey", keyPath)
-
-		err = cmd.Start()
-		Expect(err).ToNot(HaveOccurred())
-
-		time.Sleep(3 * time.Second) // the vcsim server needs a moment to come up
-	}
-
-})
-
-var _ = AfterSuite(func() {
-	if runtime.GOOS != "windows" && cmd != nil {
-		err := cmd.Process.Kill()
-		Expect(err).ToNot(HaveOccurred())
-	}
-})

stembuild/Makefile

@@ -3,7 +3,6 @@ package vcenter_manager_test
 import (
 	"context"
 	"errors"
-	"runtime"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -111,7 +110,6 @@ var _ = Describe("VcenterManager", func() {
 		})
 
 		It("returns an error if the finder does", func() {
-
 			guestErr := errors.New("not today, junior")
 			fakeOpsManager := &vcenter_managerfakes.FakeOpsManager{}
 			fakeOpsManager.ProcessManagerReturns(nil, guestErr)
@@ -124,48 +122,4 @@ var _ = Describe("VcenterManager", func() {
 
 		})
 	})
-
-	Context("running against vcsim server", func() {
-		Context("CloneVM", func() {
-			It("clones a vm", func() {
-				if runtime.GOOS == "windows" {
-					Skip("windows cannot run a vcsim server")
-				}
-
-				inventoryPath := "/DC0/vm/DC0_H0_VM0"
-				clonePath := "/DC0/vm/DC0_H0_VM0_NewClone"
-
-				factoryConfig := &vcenter_manager.FactoryConfig{
-					VCenterServer:  "https://user:[email protected]:8989/sdk",
-					Username:       "user",
-					Password:       "pass",
-					ClientCreator:  &vcenter_manager.ClientCreator{},
-					FinderCreator:  &vcenter_manager.GovmomiFinderCreator{},
-					RootCACertPath: CertPath,
-				}
-
-				managerFactory := &vcenter_manager.ManagerFactory{
-					Config: *factoryConfig,
-				}
-
-				ctx := context.TODO()
-
-				vCenterManager, err := managerFactory.VCenterManager(ctx)
-				Expect(err).ToNot(HaveOccurred())
-
-				err = vCenterManager.Login(ctx)
-				Expect(err).ToNot(HaveOccurred())
-
-				vmToClone, err := vCenterManager.FindVM(ctx, inventoryPath)
-				Expect(err).ToNot(HaveOccurred())
-
-				err = vCenterManager.CloneVM(ctx, vmToClone, clonePath)
-				Expect(err).ToNot(HaveOccurred())
-
-				_, err = vCenterManager.FindVM(ctx, clonePath)
-				Expect(err).ToNot(HaveOccurred())
-
-			})
-		})
-	})
 })