Revert change that broke live tests

This reverts commit 2a474ac9fdf16406ee37ddd0d159a61849af5356. While the code looked good, seems both @benbp and I forgot that the pipeline passed "Generated" as the `-BaseName`, so it wasn't null.
Azure · Apr 15, 2022 · e4dd7c3 · e4dd7c3
1 parent 1643467
commit e4dd7c3
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1
@@ -370,14 +370,12 @@ try {
 
     $UserName = GetUserName
 
-    if (!$BaseName) {
-        if ($CI) {
-            $BaseName = 't' + (New-Guid).ToString('n').Substring(0, 16)
-            Log "Generated base name '$BaseName' for CI build"
-        } else {
-            $BaseName = GetBaseName $UserName $ServiceDirectory
-            Log "BaseName was not set. Using default base name '$BaseName'"
-        }
+    if ($CI) {
+        $BaseName = 't' + (New-Guid).ToString('n').Substring(0, 16)
+        Log "Generated base name '$BaseName' for CI build"
+    } elseif (!$BaseName) {
+        $BaseName = GetBaseName $UserName $ServiceDirectory
+        Log "BaseName was not set. Using default base name '$BaseName'"
     }
 
     # Make sure pre- and post-scripts are passed formerly required arguments.