From 08d8e6a45a33ea5f82f8c4f473ec718b96d36920 Mon Sep 17 00:00:00 2001
From: Ben Broderick Phillips <bebroder@microsoft.com>
Date: Mon, 1 Jul 2024 17:52:23 -0400
Subject: [PATCH 1/3] Fix default value for env vars in
 build-test-resource-config template

---
 eng/common/TestResources/build-test-resource-config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/common/TestResources/build-test-resource-config.yml b/eng/common/TestResources/build-test-resource-config.yml
index c64664f852b..c890221fce3 100644
--- a/eng/common/TestResources/build-test-resource-config.yml
+++ b/eng/common/TestResources/build-test-resource-config.yml
@@ -8,7 +8,7 @@ parameters:
   # EnvVars is used to help diagnose variable conflict issues early
   - name: EnvVars
     type: object
-    default: null
+    default: {}
   - name: SubscriptionConfigurationFilePaths
     type: object
     default: null

From eb2eff1f39209c4ec17b0e39454155e6e161e1ee Mon Sep 17 00:00:00 2001
From: Ben Broderick Phillips <bebroder@microsoft.com>
Date: Tue, 2 Jul 2024 16:04:27 -0400
Subject: [PATCH 2/3] Add empty pool condition

---
 eng/common/TestResources/build-test-resource-config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/common/TestResources/build-test-resource-config.yml b/eng/common/TestResources/build-test-resource-config.yml
index c890221fce3..c183bf04836 100644
--- a/eng/common/TestResources/build-test-resource-config.yml
+++ b/eng/common/TestResources/build-test-resource-config.yml
@@ -16,6 +16,7 @@ parameters:
 steps:
   - task: AzurePowerShell@5
     displayName: Set Pipeline Subnet Info
+    condition: ne(variables['Pool'], '')
     env: ${{ parameters.EnvVars }}
     inputs:
       azureSubscription: azure-sdk-tests

From a4695dfe886a39765958a6c8de44a9c1b30e6053 Mon Sep 17 00:00:00 2001
From: Ben Broderick Phillips <bebroder@microsoft.com>
Date: Tue, 2 Jul 2024 16:11:09 -0400
Subject: [PATCH 3/3] Write delete failures as warnings

---
 eng/scripts/live-test-resource-cleanup.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/scripts/live-test-resource-cleanup.ps1 b/eng/scripts/live-test-resource-cleanup.ps1
index 55f846bb492..257abcbe82e 100644
--- a/eng/scripts/live-test-resource-cleanup.ps1
+++ b/eng/scripts/live-test-resource-cleanup.ps1
@@ -441,7 +441,8 @@ function DeleteAndPurgeGroups([array]$toDelete) {
         }
       }
     } catch {
-      Write-Error $_
+      Write-Warning "Failure deleting/purging group $($rg.ResourceGroupName):"
+      Write-Warning $_
       $hasError = $true
     }
   }