Merge pull request #2601 from sebassem/arcbox_3.0

Arcbox 3.0 patches
microsoft · Jul 8, 2024 · d070e8b · d070e8b
2 parents 69d5e9f + 1895fde
commit d070e8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1
@@ -473,9 +473,7 @@ $Favorite = $Shell.CreateShortcut($Env:USERPROFILE + "\Desktop\Kibana.url")
 $Favorite.TargetPath = $KibanaURL;
 $Favorite.Save()
 
-Stop-Process -Id $kubectlMonShellk3s.Id
-Stop-Process -Id $kubectlMonShellAKS.Id
-Stop-Process -Id $kubectlMonShellAKSDr.Id
+Get-process WindowsTerminal | Stop-Process -Force
 
 # Changing to Jumpstart ArcBox wallpaper
 $code = @'

diff --git a/azure_jumpstart_arcbox/artifacts/tests/dataops.tests.ps1 b/azure_jumpstart_arcbox/artifacts/tests/dataops.tests.ps1
@@ -8,11 +8,11 @@ BeforeDiscovery {
     $clusters = @($k3sArcDataClusterName, $aksArcClusterName, $aksdrArcClusterName)
     $customLocations = @("${k3sArcDataClusterName}-cl", "${aksArcClusterName}-cl", "${aksdrArcClusterName}-cl")
     $dataControllers = @("${k3sArcDataClusterName}-dc", "${aksArcClusterName}-dc", "${aksdrArcClusterName}-dc")
-    $sqlMiInstances = @("capi-sql", "aks-sql", "aks-dr-sql")
-    $drPartners = @("capi-sql", "aks-dr-sql")
+    $sqlMiInstances = @("k3s-sql", "aks-sql", "aks-dr-sql")
+    $drPartners = @("k3s-sql", "aks-dr-sql")
     $VMs = @("ArcBox-SQL")
 
-    $null = Connect-AzAccount -Identity -Tenant $tenantId -Subscription $subscriptionId
+    $null = Connect-AzAccount -Identity -Tenant $env:tenantId -Subscription $env:subscriptionId
     az config set extension.use_dynamic_install=yes_without_prompt
 }