From d4f6993ac90e8f7cc2ce00e105a6a8c817bda78b Mon Sep 17 00:00:00 2001
From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com>
Date: Sun, 10 Dec 2023 21:12:26 +0100
Subject: [PATCH] [macos] skip Sonoma updates for Monterey (#8985)

---
 images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1
index b6e63c210..e32ab920b 100644
--- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1
+++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1
@@ -100,14 +100,14 @@ function Invoke-SoftwareUpdate {
     $command = "sw_vers"
     $guestMacosVersion = Invoke-SSHPassCommand -HostName $ipAddress -Command $command
     switch -regex ($guestMacosVersion[1]) {
-        '12.\d' { $nextOSVersion = 'macOS Ventura' }
+        '12.\d' { $nextOSVersion = 'macOS Ventura|macOS Sonoma' }
         '13.\d' { $nextOSVersion = 'macOS Sonoma'  }
     }
     # Make an array of updates
     $listOfNewUpdates = $newUpdates.split('*').Trim('')
     foreach ($newupdate in $listOfNewUpdates) {
         # Will be True if the value is not Venture, not empty, and contains "Action: restart" words
-        if ($newupdate.Contains("Action: restart") -and !$newupdate.Contains("$nextOSVersion") -and (-not [String]::IsNullOrEmpty($newupdate))) {
+        if ($newupdate.Contains("Action: restart") -and !($newupdate -match $nextOSVersion) -and (-not [String]::IsNullOrEmpty($newupdate))) {
             Write-Host "`t[*] Sleep 120 seconds before the software updates have been installed"
             Start-Sleep -Seconds 120
 
@@ -119,7 +119,7 @@ function Invoke-SoftwareUpdate {
 
             # Check software updates have been installed
             $updates = Get-SoftwareUpdate -HostName $ipAddress
-            if ($updates.Contains("Action: restart") -and !$updates.Contains("$nextOSVersion")) {
+            if ($updates.Contains("Action: restart") -and !($newupdate -match $nextOSVersion)) {
                 Write-Host "`t[x] Software updates failed to install: "
                 Show-StringWithFormat $updates
                 exit 1