From 66835ab7034f10a513ebe5044a90fca0c5781703 Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <maxim-lobanov@github.com>
Date: Wed, 21 Dec 2022 14:19:42 +0100
Subject: [PATCH] Add logic to publish artifact (#6821)

---
 .../azure-pipelines/image-generation.yml      | 34 +++++++++++++++++--
 .../azure-pipelines/image-generation.yml      |  2 +-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml
index 77f44cce3..94ad9e21b 100644
--- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml
+++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml
@@ -89,13 +89,41 @@ jobs:
     env:
       PACKER_LOG: 1
       PACKER_LOG_PATH: $(Build.ArtifactStagingDirectory)/packer-log.txt
-
+  
   - task: PowerShell@2
-    displayName: 'Output Readme file content'
+    displayName: 'Copy image artifacts to the separate directory'
     inputs:
       targetType: 'inline'
       script: |
-        Get-Content -Path (Join-Path "$(TemplateDirectoryPath)" "${{ parameters.image_readme_name }}")
+        $readmePath = Join-Path "$(TemplateDirectoryPath)" "${{ parameters.image_readme_name }}"
+        $softwareReportPath = Join-Path "$(TemplateDirectoryPath)" "software-report.json"
+
+        Copy-Item -Path $readmePath -Destination "$(Build.ArtifactStagingDirectory)/"
+        if (Test-Path $softwareReportPath) {
+            Copy-Item -Path $softwareReportPath -Destination "$(Build.ArtifactStagingDirectory)/"
+        }
+
+  - task: PowerShell@2
+    displayName: 'Print markdown software report'
+    inputs:
+      targetType: 'inline'
+      script: |
+        Get-Content -Path "$(Build.ArtifactStagingDirectory)/${{ parameters.image_readme_name }}"
+
+  - task: PowerShell@2
+    displayName: 'Print json software report'
+    inputs:
+      targetType: 'inline'
+      script: |
+        $softwareReportPath = "$(Build.ArtifactStagingDirectory)/software-report.json"
+        if (Test-Path $softwareReportPath) {
+            Get-Content -Path $softwareReportPath
+        }
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      ArtifactName: 'Built_VM_Artifacts'
+    displayName: Publish Artifacts
 
   - task: PowerShell@2
     displayName: 'Print provisioners duration'
diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml
index 6ad177dff..ca5065e96 100644
--- a/images.CI/macos/azure-pipelines/image-generation.yml
+++ b/images.CI/macos/azure-pipelines/image-generation.yml
@@ -111,7 +111,7 @@ jobs:
 
   - bash: |
       cat "$(Build.ArtifactStagingDirectory)/systeminfo.json"
-    displayName: Print json software report   
+    displayName: Print json software report
 
   - task: PublishBuildArtifacts@1
     inputs: