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 77f44cce3c7c..94ad9e21bb30 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: 'Copy image artifacts to the separate directory' + inputs: + targetType: 'inline' + script: | + $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: 'Output Readme file content' + displayName: 'Print json software report' inputs: targetType: 'inline' script: | - Get-Content -Path (Join-Path "$(TemplateDirectoryPath)" "${{ parameters.image_readme_name }}") + $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 6ad177dff379..ca5065e960f5 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: