From 3a355831822a9df382f6ccef772922d09a0e5edd Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Mon, 19 Oct 2020 09:47:10 +0300
Subject: [PATCH] Update image-generation.yml

---
 images.CI/macos/azure-pipelines/image-generation.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml
index 3fa3ba60..71cad923 100644
--- a/images.CI/macos/azure-pipelines/image-generation.yml
+++ b/images.CI/macos/azure-pipelines/image-generation.yml
@@ -72,7 +72,7 @@ jobs:
         -var="output_folder=$(output-folder)" `
         -var="vm_username=$(vm-username)" `
         -var="vm_password=$(vm-password)" `
-        -var="build_id=${{ variables.VirtualMachineName }}" `
+        -var="build_id=$(VirtualMachineName)" `
         -var="baseimage_name=${{ parameters.base_image_name }}" `
         -var="github_feed_token=$(github-feed-token)" `
         -var="xcode_install_user=$(xcode-installation-user)" `
@@ -99,7 +99,7 @@ jobs:
       ls $(Common.TestResultsDirectory)
 
       echo "Put VM name to 'VM_Done_Name' file"
-      echo "${{ variables.VirtualMachineName }}" > "$(Build.ArtifactStagingDirectory)/VM_Done_Name"
+      echo "$(VirtualMachineName)" > "$(Build.ArtifactStagingDirectory)/VM_Done_Name"
     displayName: Prepare artifact
 
   - bash: |
@@ -126,7 +126,7 @@ jobs:
     inputs:
       targetType: 'filePath'
       filePath: ./images.CI/macos/move-vm.ps1
-      arguments: -VMName "${{ variables.VirtualMachineName }}" `
+      arguments: -VMName "$(VirtualMachineName)" `
                  -TargetDataStore "${{ parameters.target_datastore }}" `
                  -VIServer "$(vcenter-server-v2)" `
                  -VIUserName "$(vcenter-username-v2)" `
@@ -138,7 +138,7 @@ jobs:
     inputs:
       targetType: 'filePath'
       filePath: ./images.CI/macos/destroy-vm.ps1
-      arguments: -VMName "${{ variables.VirtualMachineName }}" `
+      arguments: -VMName "$(VirtualMachineName)" `
                  -VIServer "$(vcenter-server-v2)" `
                  -VIUserName "$(vcenter-username-v2)" `
                  -VIPassword "$(vcenter-password-v2)"