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/
- iaas_clients tests explicitly pass the vCenter's certificate, the
  integration/iaas_cli/ specs previously were not run on windows and on
  linux they rely on test setup which adds the certificate to the
  container's certificate store; the specs now write the certificate to
  disk and pass this path to vcenterclientfactory.FactoryConfig, as the
- "contract tests" use vcsim as library, instead of building from
  source, this should allow testing on windows
- (more) test code uses "_test" package names

Author: aramprice

ci/pipelines/stemcells-windows.yml

@@ -165,10 +165,6 @@ resources:
   type: git
   source:
     uri: https://github.com/cloudfoundry/windows-utilities-release.git
-- name: govmomi
-  type: git
-  source:
-    uri: https://github.com/vmware/govmomi.git
 
 # type: docker-image
 - name: bosh-windows-stemcell-builder-ci-docker-image
@@ -856,13 +852,19 @@ jobs:
     file: bosh-windows-stemcell-builder-ci/ci/tasks/test-integration-stembuild-windows/task.yml
     timeout: 3h
     params:
-      VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
+      CONTRACT_TEST_VM_NAME: stembuild_base_vm_2019_
+      CONTRACT_TEST_VM_PASSWORD: ((stembuild_vm_user.password))
+      CONTRACT_TEST_VM_USERNAME: ((stembuild_vm_user.username))
+
       GOVC_DATASTORE: ((nimbus_windows-demo_ds))
       GOVC_NETWORK: internal-network
       GOVC_RESOURCE_POOL: /dc0/host/concourse_cluster/Resources
+
       VCENTER_ADMIN_CREDENTIAL_URL: ((nimbus_windows-demo_auth_url))
+      VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
       VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
       VCENTER_PASSWORD: ((nimbus_windows-demo_user.password))
+
       VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
       VM_USERNAME: ((stembuild_vm_user.username))
       VM_PASSWORD: ((stembuild_vm_user.password))
@@ -925,7 +927,6 @@ jobs:
       - get: blobstore-gcs-cli
       - get: windows-bsdtar
       - get: windows-winsw
-      - get: govmomi
   - put: version
     inputs: detect
     resource: stembuild-linux-build-number
@@ -944,20 +945,6 @@ jobs:
       - task: unit-test
         file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-stembuild-linux/task.yml
         image: bosh-windows-stemcell-builder-ci-image
-      - task: contract-test
-        file: bosh-windows-stemcell-builder-ci/ci/tasks/test-contract-stembuild-linux/task.yml
-        image: bosh-windows-stemcell-builder-ci-image
-        tags: [windows-nimbus]
-        params:
-          VCENTER_ADMIN_CREDENTIAL_URL: ((nimbus_windows-demo_auth_url))
-          VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
-          PACKAGE_TEST_VM_NAME: stembuild-package-integration-tests-base-vm
-          VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
-          VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
-          VCENTER_PASSWORD: ((nimbus_windows-demo_user.password))
-          CONTRACT_TEST_VM_NAME: stembuild_base_vm_2019_
-          CONTRACT_TEST_VM_PASSWORD: ((stembuild_vm_user.password))
-          CONTRACT_TEST_VM_USERNAME: ((stembuild_vm_user.username))
       - task: setup-integration-test-vm
         file: bosh-windows-stemcell-builder-ci/ci/tasks/setup-integration-test-vm/task.yml
         image: bosh-windows-stemcell-builder-ci-image
@@ -983,13 +970,19 @@ jobs:
     tags: [windows-nimbus]
     timeout: 3h
     params:
-      VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
+      CONTRACT_TEST_VM_NAME: stembuild_base_vm_2019_
+      CONTRACT_TEST_VM_PASSWORD: ((stembuild_vm_user.password))
+      CONTRACT_TEST_VM_USERNAME: ((stembuild_vm_user.username))
+
       GOVC_DATASTORE: ((nimbus_windows-demo_ds))
       GOVC_NETWORK: internal-network
       GOVC_RESOURCE_POOL: /dc0/host/concourse_cluster/Resources
+
       VCENTER_ADMIN_CREDENTIAL_URL: ((nimbus_windows-demo_auth_url))
+      VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
       VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
       VCENTER_PASSWORD: ((nimbus_windows-demo_user.password))
+
       VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
       VM_USERNAME: ((stembuild_vm_user.username))
       VM_PASSWORD: ((stembuild_vm_user.password))

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

@@ -4,24 +4,22 @@ set -x
 
 ROOT_DIR=$(pwd)
 
+export OUTPUT_DIR="${ROOT_DIR}/output"
+
 VERSION=$(cat version/version)
-OUTPUT_DIR="${ROOT_DIR}/output"
+export STEMBUILD_VERSION="${VERSION}"
 
 source "bosh-windows-stemcell-builder-ci/ci/common-scripts/update_nimbus_urls_and_cert.sh"
 
-echo '***Installing VMWare OVF Tools***'
-chmod +x ./ovftool/VMware-ovftool-4.2.0-5965791-lin.x86_64.bundle
-./ovftool/VMware-ovftool-4.2.0-5965791-lin.x86_64.bundle --eulas-agreed --required
+echo '---> Install VMWare OVF Tools'
+chmod +x "${ROOT_DIR}/ovftool/VMware-ovftool-4.2.0-5965791-lin.x86_64.bundle"
+"${ROOT_DIR}/ovftool/VMware-ovftool-4.2.0-5965791-lin.x86_64.bundle" --eulas-agreed --required
 
-export STEMBUILD_VERSION
 export TARGET_VM_IP
-export VM_NAME
-
-STEMBUILD_VERSION=$(cat version/version)
 TARGET_VM_IP=$(cat nimbus-ips/name)
+export VM_NAME
 VM_NAME=$(cat integration-vm-name/name)
-
-echo "Using Existing VM IP/Name: ${TARGET_VM_IP}/${VM_NAME}"
+echo "Using VM @ IPAddr: ${VM_NAME}@${TARGET_VM_IP}"
 
 pushd "${ROOT_DIR}/stemcell-builder/stembuild"
   echo '***Test Stembuild Code***'

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-integration-stembuild-linux/run.sh

@@ -5,7 +5,6 @@ go 1.23.0
 require (
 	github.com/concourse/pool-resource v1.1.1
 	github.com/google/subcommands v1.2.0
-	github.com/google/uuid v1.6.0
 	github.com/masterzen/winrm v0.0.0-20240702205601-3fad6e106085
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.11.3
 	github.com/onsi/ginkgo/v2 v2.23.4
@@ -29,6 +28,7 @@ require (
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect

stembuild/Makefile

@@ -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)
-})

stembuild/go.mod

@@ -1,97 +1,13 @@
-package iaas_clients
+package iaas_clients_test
 
 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
-}