From c4f5d4666847c2dd74d851ab7b4354e6efd7aee6 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 2 Jan 2024 11:15:00 -0600 Subject: [PATCH] Fix VMR build tagging (#18067) --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 2 +- .../content/eng/pipelines/templates/stages/vmr-scan.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index a59bf7dd7..aeab74edd 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -38,7 +38,7 @@ jobs: echo "Dotnet-dotnet build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results" - installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer-,,g") + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer ,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) if [[ -z "$installer_build" ]]; then echo "Could not find a build of installer for commit '$installer_sha'" diff --git a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml index 99a34658f..6024ce182 100644 --- a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml +++ b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml @@ -28,7 +28,7 @@ stages: - script: | set -e sha=`./.dotnet/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" installer` - echo "##vso[build.addbuildtag]installer-$sha" + echo "##vso[build.addbuildtag]$sha" displayName: Tag the build workingDirectory: $(Build.SourcesDirectory)/src/installer