From 1895fdeb5481c9f94140d6bae497955333dbac38 Mon Sep 17 00:00:00 2001
From: Seif Bassem <38246040+sebassem@users.noreply.github.com>
Date: Mon, 8 Jul 2024 18:14:38 +0300
Subject: [PATCH] chore: Stop WindowsTerminal process before changing Jumpstart
 ArcBox wallpaper

---
 azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1  | 4 +---
 azure_jumpstart_arcbox/artifacts/tests/dataops.tests.ps1 | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1
index dd8a0b062a..fefb3dca6a 100644
--- 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
index 87129839b5..e0d364f24e 100644
--- 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
 }