diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index ee80659d0c83..71865ac68f4d 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -949,11 +949,35 @@ stages: displayName: VMR Validation dependsOn: VMR_Final_Join jobs: - - job: ValidateSigning - displayName: Validate Signing + - job: ValidateSigning_Windows + displayName: Validate Signing - Windows pool: ${{ parameters.pool_Windows }} timeoutInMinutes: 240 steps: - template: ../steps/vmr-validate-signing.yml parameters: + artifactName: PackageArtifacts continueOnError: true + OS: Windows_NT + + - job: ValidateSigning_Mac + displayName: Validate Signing - Mac + pool: ${{ parameters.pool_Mac }} + timeoutInMinutes: 240 + steps: + - template: ../steps/vmr-validate-signing.yml + parameters: + artifactName: BlobArtifacts + continueOnError: true + OS: Darwin + + - job: ValidateSigning_Linux + displayName: Validate Signing - Linux + pool: ${{ parameters.pool_Linux }} + timeoutInMinutes: 240 + steps: + - template: ../steps/vmr-validate-signing.yml + parameters: + artifactName: BlobArtifacts + continueOnError: true + OS: Linux diff --git a/eng/pipelines/templates/steps/vmr-validate-signing.yml b/eng/pipelines/templates/steps/vmr-validate-signing.yml index cee51d040259..a4b017e798e9 100644 --- a/eng/pipelines/templates/steps/vmr-validate-signing.yml +++ b/eng/pipelines/templates/steps/vmr-validate-signing.yml @@ -1,15 +1,25 @@ parameters: +- name: artifactName + type: string + - name: continueOnError type: boolean default: false +- name: OS + type: string + values: + - Windows_NT + - Linux + - Darwin + steps: - task: DownloadBuildArtifacts@1 inputs: - artifactName: 'PackageArtifacts' + artifactName: ${{ parameters.artifactName }} downloadPath: $(Build.ArtifactStagingDirectory) checkDownloadedFiles: true - displayName: Download Package Artifacts + displayName: Download Artifacts # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here @@ -17,10 +27,20 @@ steps: - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' -- task: PowerShell@2 - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - displayName: Validate Signing of Packages - continueOnError: ${{ parameters.continueOnError }} +- ${{ if eq(parameters.OS, 'Windows_NT') }}: + - task: PowerShell@2 + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/${{ parameters.artifactName }}' + displayName: Validate Signing of Packages + continueOnError: ${{ parameters.continueOnError }} + +- ${{ else }}: + - task: Bash@3 + inputs: + filePath: eng/common/sdk-task.sh + arguments: --task SigningValidation --restore + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/${{ parameters.artifactName }}' + displayName: Validate - ${{ parameters.OS }} + continueOnError: ${{ parameters.continueOnError }}