devops: improving build suffix logic

Author: brettsam

azure-pipelines.yml

@@ -1,5 +1,8 @@
-name: $(Build.BuildId) # This will be updated during InitializePipeline
+variables:
+  buildNumber: $[ counter('constant', 13000) ] # Start higher than our AppVeyor versions. Every build (pr or branch) will increment.
 
+name: 3.0.$(buildNumber)
+  
 pr:
   branches:
     include:
@@ -16,8 +19,6 @@ jobs:
 - job: InitializePipeline
   pool:
     vmImage: 'windows-2019'
-  variables:
-    counter: $[ counter('constant', 13000) ] # Start higher than our AppVeyor versions. Every build (pr or branch) will increment.
   steps:
   - task: AzureKeyVault@1
     inputs:
@@ -36,9 +37,13 @@ jobs:
   dependsOn: InitializePipeline
   condition: and(succeeded(), or(ne(variables['Build.Reason'], 'PullRequest'), eq(dependencies.InitializePipeline.outputs['Initialize.BuildArtifacts'], true)))
   variables:
-    suffix: $[ dependencies.InitializePipeline.outputs['Initialize.Suffix'] ]
-    emgSuffix: $[ dependencies.InitializePipeline.outputs['Initialize.EmgSuffix'] ]
-    buildNumber: $[ dependencies.InitializePipeline.outputs['Initialize.BuildNumber'] ]
+    ${{ if or( eq( variables['Build.Reason'], 'PullRequest' ), not( endswith( variables['Build.SourceBranch'], 'release/3.0' ) ) ) }}:
+      suffixTemp: ci
+      packSuffixSwitchTemp: --version-suffix ci
+      emgSuffixSwitchTemp: --version-suffix ci$(buildNumber)
+    suffix: $[variables.suffixTemp] # this resolves to an empty string if it is missing
+    packSuffixSwitch: $[variables.packSuffixSwitchTemp]
+    emgSuffixSwitch: $[variables.emgSuffixSwitchTemp]
   pool:
     vmImage: 'windows-2019' 
   steps:
@@ -62,7 +67,7 @@ jobs:
     inputs:
       command: 'custom'
       custom: 'pack'
-      arguments: '-o packages -p:BuildNumber=$(buildNumber) -p:CommitHash=$(Build.SourceVersion) --version-suffix "$(suffix)" -c Release'
+      arguments: -o packages -p:BuildNumber=$(buildNumber) -p:CommitHash=$(Build.SourceVersion) -c Release $(packSuffixSwitch)
       projects: |
         **\WebJobs.Script.csproj
         **\WebJobs.Script.WebHost.csproj
@@ -136,7 +141,7 @@ jobs:
     inputs:
       command: 'custom'
       custom: 'pack'
-      arguments: '--no-build -c Release -o packages --version-suffix "$(emgSuffix)"'
+      arguments: '--no-build -c Release -o packages $(emgSuffixSwitch)'
       projects: |
         **\ExtensionsMetadataGenerator.csproj
         steps:

build/initialize-pipeline.ps1

@@ -11,29 +11,9 @@ function AcquireLease($blob) {
   } 
 }
 
-# set the build suffix
-$sourceBranch = $env:BUILD_SOURCEBRANCH
-$sourceBranchName = $env:BUILD_SOURCEBRANCHNAME
 $buildReason = $env:BUILD_REASON
-$buildNumber = "$env:COUNTER"
-Write-Host "Source branch: '$sourceBranch'"
-Write-Host "Source branch name: '$sourceBranchName'"
-Write-Host "Build reason: '$buildReason'"
-Write-Host "Build number: '$buildNumber'"
-
-$buildNamePrefix = ""
-$isReleaseBuild = $false
 
 if ($buildReason -eq "PullRequest") {
-  $sourceBranch = $env:SYSTEM_PULLREQUEST_SOURCEBRANCH
-  $targetBranch = $env:SYSTEM_PULLREQUEST_TARGETBRANCH
-  $prNumber = $env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER
-  $buildNamePrefix = "(PR $prNumber) "
-  Write-Host "PR source branch: '$sourceBranch'"
-  Write-Host "PR target branch: '$targetBranch'"
-  Write-Host "PR number: '$prNumber'"
-  Write-Host "Build name prefix: '$buildNamePrefix'"
-
   # parse PR title to see if we should pack this
   $response = Invoke-RestMethod api.github.com/repos/$env:BUILD_REPOSITORY_ID/pulls/$env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER
   $title = $response.title.ToLowerInvariant()
@@ -42,33 +22,8 @@ if ($buildReason -eq "PullRequest") {
     Write-Host "##vso[task.setvariable variable=BuildArtifacts;isOutput=true]true"
     Write-Host "Setting 'BuildArtifacts' to true."
   }
-} else {
-  if ($sourceBranch.endswith("release/3.0")) {
-    Write-Host "This is a release build."
-    $isReleaseBuild = $true
-  }
-}
-
-$suffix = "ci"
-$emgSuffix = "ci$buildNumber" #ExtensionsMetadataGenerator suffix
-
-if ($isReleaseBuild) {
-  $suffix = ""
-  $emgSuffix = ""
-  $buildNamePrefix = "(Release) "
 }
 
-$buildName = "$buildNamePrefix" + "3.0." + "$buildNumber"
-
-Write-Host "##vso[task.setvariable variable=Suffix;isOutput=true]$suffix"
-Write-Host "##vso[task.setvariable variable=EmgSuffix;isOutput=true]$emgSuffix"
-Write-Host "##vso[task.setvariable variable=BuildNumber;isOutput=true]$buildNumber"
-Write-Host "##vso[build.updatebuildnumber]$buildName"
-Write-Host "Setting 'Suffix' to '$suffix'."
-Write-Host "Setting 'EmgSuffix' to '$emgSuffix'."
-Write-Host "Setting 'BuildNumber' to '$buildNumber'."
-Write-Host "Setting build name to '$buildName'."
-
 # get a blob lease to prevent test overlap
 $storageContext = New-AzureStorageContext -ConnectionString $connectionString
 While($true) {