From e3adf1b15bb19fcc04297e1ec13aadc2156fffef Mon Sep 17 00:00:00 2001
From: Joseph Callen <jcallen@redhat.com>
Date: Wed, 19 Nov 2025 08:49:48 -0500
Subject: [PATCH] vSphere upi: change to infra id for folders

This commit changes from using the cluster name
for folder creation naming to infraid.

We think that the reuse of build cluster namespaces
might be contributing to ci failures
---
 upi/vsphere/powercli/upi-functions.ps1 | 4 ++--
 upi/vsphere/powercli/upi.ps1           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/upi/vsphere/powercli/upi-functions.ps1 b/upi/vsphere/powercli/upi-functions.ps1
index 144226c3ef..4c4079e7ee 100644
--- a/upi/vsphere/powercli/upi-functions.ps1
+++ b/upi/vsphere/powercli/upi-functions.ps1
@@ -315,7 +315,7 @@ function New-OpenshiftVMs {
             $tag = Get-Tag -Server $node.server -Category $tagCategory -Name "$($metadata.infraID)" -ErrorAction continue 2>$null
 
             # Get correct template / folder
-            $folder = Get-Folder -Server $node.server -Name $clustername -Location $node.datacenter
+            $folder = Get-Folder -Server $node.server -Name $metadata.infraID -Location $node.datacenter
             $template = Get-VM -Server $node.server -Name $vm_template -Location $($node.datacenter)
 
             # Clone the virtual machine from the imported template
@@ -369,4 +369,4 @@ function Set-SecureBoot {
     $spec.BootOptions = $boot
 
     $VM.ExtensionData.ReconfigVM($spec)
-}
\ No newline at end of file
+}
diff --git a/upi/vsphere/powercli/upi.ps1 b/upi/vsphere/powercli/upi.ps1
index 2d8eec7cd3..b826e150ab 100644
--- a/upi/vsphere/powercli/upi.ps1
+++ b/upi/vsphere/powercli/upi.ps1
@@ -177,13 +177,13 @@ foreach ($fd in $fds)
 
     # If the folder already exists
     Write-Output "Checking for folder in failure domain $($fd.datacenter)/$($fd.cluster)"
-    $folder = Get-Folder -Server $viserver -Name $clustername -Location $fd.datacenter -ErrorAction continue 2>$null
+    $folder = Get-Folder -Server $viserver -Name $metadata.infraID -Location $fd.datacenter -ErrorAction continue 2>$null
 
     # Otherwise create the folder within the datacenter as defined in the upi-variables
     if (-Not $?) {
         Write-Output "Creating folder $($clustername) in datacenter $($fd.datacenter) of vCenter $($fd.server)"
-        (get-view (Get-Datacenter -Server $viserver -Name $fd.datacenter).ExtensionData.vmfolder).CreateFolder($clustername)
-        $folder = Get-Folder -Server $viserver -Name $clustername -Location $fd.datacenter
+        (get-view (Get-Datacenter -Server $viserver -Name $fd.datacenter).ExtensionData.vmfolder).CreateFolder($metadata.infraID)
+        $folder = Get-Folder -Server $viserver -Name $metadata.infraID -Location $fd.datacenter
         New-TagAssignment -Server $viserver -Entity $folder -Tag $tag > $null
     }
 
@@ -257,7 +257,7 @@ $tagCategory = Get-TagCategory -Server $fds[0].server -Name "openshift-$($metada
 $tag = Get-Tag -Server $fds[0].server -Category $tagCategory -Name "$($metadata.infraID)" -ErrorAction continue 2>$null
 $rp = Get-ResourcePool -Name $($metadata.infraID) -Location $(Get-Cluster -Server $fds[0].server -Name $($fds[0].cluster))
 $datastoreInfo = Get-Datastore -Name $fds[0].datastore -Server $fds[0].server -Location $fds[0].datacenter
-$folder = Get-Folder -Server $fds[0].server -Name $clustername -Location $fds[0].datacenter
+$folder = Get-Folder -Server $fds[0].server -Name $metadata.infraID -Location $fds[0].datacenter
 $template = Get-VM -Server $fds[0].server -Name $vm_template -Location $fds[0].datacenter
 
 # Create LB for Cluster