Use BuildID to fix race ondition (#17459)

Azure · Nov 16, 2020 · 35f8631 · 35f8631
1 parent d4084a0
commit 35f8631
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -62,6 +62,7 @@ jobs:
             pwsh: true
             workingDirectory: $(Build.SourcesDirectory)
             filePath: eng/scripts/SetTestPipelineVersion.ps1
+            arguments: '-BuildNumber $(Build.BuildNumber)'
 
       - script: |
           echo "##vso[build.addbuildtag]Scheduled"

diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml
@@ -70,6 +70,7 @@ stages:
                     pwsh: true
                     workingDirectory: $(Build.SourcesDirectory)
                     filePath: eng/scripts/SetTestPipelineVersion.ps1
+                    arguments: '-BuildNumber $(Build.BuildNumber)'
 
               - task: UsePythonVersion@0
                 displayName: 'Use Python 3.6'

diff --git a/eng/scripts/SetTestPipelineVersion.ps1 b/eng/scripts/SetTestPipelineVersion.ps1
@@ -1,5 +1,11 @@
-# Overides the project file and CHANGELOG.md for the template project using the next publishable version
+# Overides the project file and CHANGELOG.md for the template project.
 # This is to help with testing the release pipeline.
+
+param (
+  [Parameter(mandatory = $true)]
+  $BuildNumber
+)
+
 . "${PSScriptRoot}\..\common\scripts\common.ps1"
 $latestTags = git tag -l "azure-sdk-template_*"
 $semVars = @()
@@ -16,7 +22,9 @@ $semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)
 LogDebug "Last Published Version $($semVarsSorted[0])"
 
 $newVersion = [AzureEngSemanticVersion]::ParseVersionString($semVarsSorted[0])
-$newVersion.IncrementAndSetToPrerelease()
+$newVersion.PrereleaseLabel = "beta"
+$newVersion.PrereleaseNumber = $BuildNumber
+
 LogDebug "Version to publish [ $($newVersion.ToString()) ]"
 
 $pomFileContent = New-Object -TypeName XML