From 192509400a704a3bde5800d83e48a84bd372f4b3 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Thu, 16 Dec 2021 13:55:29 +0300
Subject: [PATCH] Add TagName param with default value unixtimestamp (#4753)

---
 images.CI/macos/anka/Anka.Helpers.psm1           | 6 +++---
 images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1
index d076625f..dcf1550f 100644
--- a/images.CI/macos/anka/Anka.Helpers.psm1
+++ b/images.CI/macos/anka/Anka.Helpers.psm1
@@ -6,7 +6,7 @@ function Push-AnkaTemplateToRegistry {
 
         [Parameter(Mandatory)]
         [ValidateNotNullOrEmpty()]
-        [string] $TagVersion,
+        [string] $TagName,
 
         [Parameter(Mandatory)]
         [ValidateNotNullOrEmpty()]
@@ -17,12 +17,12 @@ function Push-AnkaTemplateToRegistry {
     $images = anka --machine-readable registry --registry-path $RegistryUrl list | ConvertFrom-Json | ForEach-Object body
     $images | Where-Object name -eq $TemplateName | ForEach-Object {
         $id = $_.id
-        Show-StringWithFormat "Deleting '$TemplateName[$id]' VM and '$TagVersion' tag"
+        Show-StringWithFormat "Deleting '$TemplateName[$id]' VM and '$TagName' tag"
         $uri = '{0}/registry/vm?id={1}' -f $RegistryUrl, $id
         Invoke-WebRequest -Uri $uri -Method Delete | Out-Null
     }
 
-    $command = "anka registry --registry-path $RegistryUrl push --force --tag $TagVersion $TemplateName"
+    $command = "anka registry --registry-path $RegistryUrl push --force --tag $TagName $TemplateName"
     Invoke-AnkaCommand -Command $command
 }
 
diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1
index ff38c1b6..a140c394 100644
--- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1
+++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1
@@ -25,7 +25,8 @@ param(
     [int] $CPUCount = 6,
     [int] $RamSizeGb = 7,
     [int] $DiskSizeGb = 300,
-    [string] $DisplayResolution = "1920x1080"
+    [string] $DisplayResolution = "1920x1080",
+    [string] $TagName = [DateTimeOffset]::Now.ToUnixTimeSeconds()
 )
 
 $ErrorActionPreference = "Stop"
@@ -179,5 +180,5 @@ Write-Host "`t[*] Setting screen resolution to $DisplayResolution for $TemplateN
 Set-AnkaVMDisplayResolution -VMName $TemplateName -DisplayResolution $DisplayResolution
 
 # Push a VM template (and tag) to the Cloud
-Write-Host "`t[*] Pushing '$TemplateName' image with '$ShortMacOSVersion' tag to the '$RegistryUrl' registry..."
-Push-AnkaTemplateToRegistry -RegistryUrl $registryUrl -TagVersion $shortMacOSVersion -TemplateName $TemplateName
+Write-Host "`t[*] Pushing '$TemplateName' image with '$TagName' tag to the '$RegistryUrl' registry..."
+Push-AnkaTemplateToRegistry -RegistryUrl $registryUrl -TagName $TagName -TemplateName $TemplateName