[Windows] Update google updater service name parser (actions#9738)

grafana · Jun 11, 2024 · cca605b · cca605b
1 parent 76c1d0b
commit cca605b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1
@@ -12,7 +12,7 @@ Install-Binary `
 Write-Host "Adding the firewall rule for Google update blocking..."
 New-NetFirewallRule -DisplayName "BlockGoogleUpdate" -Direction Outbound -Action Block -Program "C:\Program Files (x86)\Google\Update\GoogleUpdate.exe"
 
-$googleServices = @('gupdate', 'gupdatem') | Get-Service
+$googleServices = Get-Service -Name "GoogleUpdater*"
 Stop-Service $googleServices
 $googleServices.WaitForStatus('Stopped', "00:01:00")
 $googleServices | Set-Service -StartupType Disabled

diff --git a/images/windows/scripts/tests/Browsers.Tests.ps1 b/images/windows/scripts/tests/Browsers.Tests.ps1
@@ -28,14 +28,11 @@ Describe "Chrome" {
             $versionInfo | Should -Not -BeNullOrEmpty
         }
 
-        It "gupdate service is stopped" {
-            $svc = Get-Service -Name gupdate
-            $svc.Status | Should -BeExactly Stopped
-        }
-
-        It "gupdatem service is stopped" {
-            $svc = Get-Service -Name gupdatem
-            $svc.Status | Should -BeExactly Stopped
+        It "GoogleUpdater services is stopped" {
+            $services = Get-Service -Name "GoogleUpdater*"
+            foreach ($svc in $services) {
+                $svc.Status | Should -BeExactly 'Stopped'
+            }
         }
 
         It "BlockGoogleUpdate firewall rule exists" {