From 9a48139d0e372c299f06972b43d035f91a9550c3 Mon Sep 17 00:00:00 2001
From: Dmitry Shibanov <v-dmshib@microsoft.com>
Date: Tue, 22 Sep 2020 12:54:47 +0300
Subject: [PATCH] add attempts

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

diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml
index 4798c73f..7f02d90f 100644
--- a/images.CI/macos/azure-pipelines/image-generation.yml
+++ b/images.CI/macos/azure-pipelines/image-generation.yml
@@ -7,16 +7,14 @@ jobs:
   variables:
   - group: Mac-Cloud Image Generation
   - group: Mac-Cloud Image Generation Key Vault
+  - name: VirtualMachineName
+    value: $(Build.BuildNumber).$(System.JobAttempt)
 
   steps:
   - checkout: self
     clean: true
     fetchDepth: 1
 
-  - pwsh: |
-      Get-ChildItem Env:
-      exit 1
-
   - task: PowerShell@2
     displayName: 'Validate contributor permissions'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/pull/')
@@ -60,7 +58,7 @@ jobs:
         -var="output_folder=$(output-folder)" `
         -var="vm_username=$(vm-username)" `
         -var="vm_password=$(vm-password)" `
-        -var="build_id=$(Build.BuildNumber)" `
+        -var="build_id=${{ variables.VirtualMachineName }}" `
         -var="baseimage_name=${{ parameters.base_image_name }}" `
         -var="github_feed_token=$(github-feed-token)" `
         -var="xcode_install_user=$(xcode-installation-user)" `
@@ -87,7 +85,7 @@ jobs:
       ls $(Common.TestResultsDirectory)
 
       echo "Put VM name to 'VM_Done_Name' file"
-      echo "$(Build.BuildNumber)" > "$(Build.ArtifactStagingDirectory)/VM_Done_Name"
+      echo "${{ variables.VirtualMachineName }}" > "$(Build.ArtifactStagingDirectory)/VM_Done_Name"
     displayName: Prepare artifact
 
   - bash: |