From fc78f5bbc94c40c0b3dac284079828e918bc3b8c Mon Sep 17 00:00:00 2001
From: Ben Broderick Phillips <bebroder@microsoft.com>
Date: Wed, 5 Apr 2023 16:03:35 -0400
Subject: [PATCH] Fix regression - base name overrides in CI

---
 eng/common/TestResources/SubConfig-Helpers.ps1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/common/TestResources/SubConfig-Helpers.ps1 b/eng/common/TestResources/SubConfig-Helpers.ps1
index f87b088c3dd3..4ef744828b84 100644
--- a/eng/common/TestResources/SubConfig-Helpers.ps1
+++ b/eng/common/TestResources/SubConfig-Helpers.ps1
@@ -23,6 +23,12 @@ function GetBaseAndResourceGroupNames(
     [string]$serviceDirectoryName,
     [bool]$CI
 ) {
+    if ($baseNameDefault) {
+        $base = $baseNameDefault.ToLowerInvariant()
+        $group = $resourceGroupNameDefault ? $resourceGroupNameDefault : ("rg-$baseNameDefault".ToLowerInvariant())
+        return $base, $group
+    }
+
     if ($CI) {
         $base = 't' + (New-Guid).ToString('n').Substring(0, 16)
         # Format the resource group name based on resource group naming recommendations and limitations.
@@ -37,12 +43,6 @@ function GetBaseAndResourceGroupNames(
         return $base, $group
     }
 
-    if ($baseNameDefault) {
-        $base = $baseNameDefault.ToLowerInvariant()
-        $group = $resourceGroupNameDefault ? $resourceGroupNameDefault : ("rg-$baseNameDefault".ToLowerInvariant())
-        return $base, $group
-    }
-
     # Handle service directories in nested directories, e.g. `data/aztables`
     $serviceDirectorySafeName = $serviceDirectoryName -replace '[\./\\]', ''
     # Seed off resource group name if set to avoid name conflicts with deployments where it is not set