fix: pass datacenter (#710)

* fix: pass datacenter * fix: add dc1 to release jobs as well * fix: release jobs do not need that
mesosphere · Mar 2, 2023 · eb54427 · eb54427
1 parent f65d6f0
commit eb54427
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/vsphere-e2e.yaml b/.github/workflows/vsphere-e2e.yaml
@@ -84,3 +84,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.MESOSPHERECI_USER_TOKEN }}
           VSPHERE_SERVER: ${{ secrets.VSPHERE_SERVER }}
           VSPHERE_DATASTORE: ${{ secrets.VSPHERE_DATASTORE }}
+          VSPHERE_DATACENTER: dc1
diff --git a/pkg/packer/manifests/vsphere/packer.pkr.hcl b/pkg/packer/manifests/vsphere/packer.pkr.hcl
@@ -176,6 +176,11 @@ variable "vsphere_username" {
   default = "${env("VSPHERE_USERNAME") == "" ? env("VSPHERE_USER") : env("VSPHERE_USERNAME") }"
 }
 
+variable "vsphere_datacenter" {
+  type = string
+  default = "${env("VSPHERE_DATACENTER")}"
+}
+
 variable "ssh_bastion_host" {
   type = string
   default = ""
@@ -474,7 +479,7 @@ build {
     strip_path = true
   }
   post-processor "shell-local" {
-    inline = [ "if ${var.dry_run}; then echo 'destroying VM ${local.vm_name}'; govc vm.destroy ${local.vm_name}; fi"]
+    inline = [ "if ${var.dry_run}; then echo 'destroying VM ${local.vm_name}'; govc vm.destroy -dc=${var.vsphere_datacenter} ${local.vm_name}; fi"]
     environment_vars =[
         "GOVC_URL=${var.vcenter_server}",
         "GOVC_USERNAME=${var.vsphere_username}",