Update retry logic in Verify and Merge scipt, Update Delete-RemoteBra… (

#1160)

- Update retry logic in Verify and Merge scripts.
- Update Delete-RemoteBranches.ps1

eng/common/scripts/Delete-RemoteBranches.ps1

@@ -30,7 +30,9 @@ foreach ($branch in $branches)
     exit 1
   }
 
-  if ($pullRequests -and (($pullRequests | ? { $_.State -eq "open" }).Count -eq 0))
+  $openPullRequests = $pullRequests | ? { $_.State -eq "open" }
+
+  if ($openPullRequests.Count -eq 0)
   {
     LogDebug "Branch [ $branchName ] in repo [ $RepoName ] has no associated open Pull Request. Deleting Branch"
     try{

eng/common/scripts/git-branch-push.ps1

@@ -30,10 +30,7 @@ param(
     [string] $RemoteName = "azure-sdk-fork",
 
     [Parameter(Mandatory = $false)]
-    [boolean] $SkipCommit = $false,
-
-    [Parameter(Mandatory = $false)]
-    [boolean] $AmendCommit = $false
+    [boolean] $SkipCommit = $false
 )
 
 # This is necessay because of the janky git command output writing to stderr.
@@ -69,14 +66,8 @@ if ($LASTEXITCODE -ne 0)
 }
 
 if (!$SkipCommit) {
-    if ($AmendCommit) {
-        Write-Host "git -c user.name=`"azure-sdk`" -c user.email=`"azuresdk@microsoft.com`" commit -am `"$($CommitMsg)`""
-        git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" commit --amend -am "$($CommitMsg)"
-    }
-    else {
-        Write-Host "git -c user.name=`"azure-sdk`" -c user.email=`"azuresdk@microsoft.com`" commit --amend -am `"$($CommitMsg)`""
-        git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" commit -am "$($CommitMsg)"
-    }
+    Write-Host "git -c user.name=`"azure-sdk`" -c user.email=`"azuresdk@microsoft.com`" commit --amend -am `"$($CommitMsg)`""
+    git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" commit --amend -am "$($CommitMsg)"
     if ($LASTEXITCODE -ne 0)
     {
         Write-Error "Unable to add files and create commit LASTEXITCODE=$($LASTEXITCODE), see command output above."

eng/pipelines/templates/steps/sync-directory.yml

@@ -66,7 +66,6 @@ steps:
           -CommitMsg "${{ parameters.CommitMessage }}"
           -GitUrl "https://$(azuresdk-github-pat)@github.com/${{ parameters.PROwner }}/${{ repo }}.git"
           -PushArgs "${{ parameters.PushArgs }}"
-          -AmendCommit $True
 
     - task: PowerShell@2
       displayName: Queue test pipeline

eng/scripts/Verify-And-Merge-PRs.ps1

@@ -66,11 +66,12 @@ do
       exit 1
     }
   }
-  if ($unMergablePRs.Count -gt 0)
+
+  $RetryCount--
+  if (($unMergablePRs.Count -gt 0) -and ($RetryCount -gt 0) -and $ShouldMerge)
   {
     $PRData = $unMergablePRs
     Start-Sleep -Seconds 30
-    $RetryCount--
     LogDebug "Retrying merging for unmergable Prs"
     $ReadyForMerge = $true
   }