[CI] Fix build reason if and uses a better branch name. (#11690)

tools/devops/automation/templates/publish-html-result.yml

@@ -31,14 +31,14 @@ steps:
     Write-Host "##vso[task.setvariable variable=BuildId;isOutput=true]$($config.BuildId)"
     Write-Host "##vso[task.setvariable variable=Commit;isOutput=true]$($config.Commit)"
     # calculate branch name and destination dir
-    $branchName = "$($config.BuildSourceBranchName)/$($config.Commit)/$($config.BuildId)"
-    $prefix = ""
-    if ($Env:OriginalBuildReason -eq "PullRequest") {
-      $prefix = "pr"
+    $branchName = ""
+    if ($config.BuildReason -eq "PullRequest") {
+      $branchName = "pr/PR$($config.Commit)"
     } else {
-      $prefix = "ci"
+      $branchName = "ci/$($config.BuildSourceBranchName)/$($config.Commit)"
     }
-    $branchName = "$prefix/$branchName"
+
+    $branchName = "$branchName/$($config.BuildId)"
     Write-Host "##vso[task.setvariable variable=PublishingBranchName;isOutput=true]$branchName"
     Write-Host "##vso[task.setvariable variable=PublishingPath;isOutput=true]$branchName"
   name: configuration
@@ -111,11 +111,10 @@ steps:
 
     git add $Env:PublishingPath
     git commit -m"[CI] Add test results for build $Env:OriginalBuildId"
-    git push origin $Env:PublishingBranchName
+    git push origin $Env:PublishingBranchName -f
   displayName: 'Add files and clean logs'
   timeoutInMinutes: 30
   env:
     PublishingPath: $(configuration.PublishingPath)
     OriginalBuildId: $(configuration.BuildId)
     PublishingBranchName: $(configuration.PublishingBranchName)
-