Fix VMR path variable (#14887)

eng/pipelines/templates/jobs/vmr-synchronization.yml

@@ -25,6 +25,10 @@ jobs:
   displayName: Synchronize dotnet/dotnet
   timeoutInMinutes: 120
 
+  variables:
+  - name: vmrPath
+    value: $(Agent.BuildDirectory)/vmr
+
   pool:
     ${{ if eq(variables['System.TeamProject'], 'public') }}:
       name: NetCore-Public
@@ -53,8 +57,8 @@ jobs:
   - ${{ if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal')) }}:
     - task: ComponentGovernanceComponentDetection@0
       inputs:
-        sourceScanPath: $(Agent.BuildDirectory)/vmr
+        sourceScanPath: $(vmrPath)
-        ignoreDirectories: $(Agent.BuildDirectory)/vmr/src
+        ignoreDirectories: $(vmrPath)/src
 
   - script: |-
       source ./eng/common/tools.sh
@@ -71,13 +75,13 @@ jobs:
         cp -r $(Agent.BuildDirectory)/installer $(Agent.TempDirectory)/installer
       displayName: '[PR Only] Prepare dotnet/installer clone'
 
-  - script: git branch -B ${{ parameters.vmrBranch }}
+  - script: git checkout -B ${{ parameters.vmrBranch }}
     displayName: Prepare branch ${{ parameters.vmrBranch }}
     workingDirectory: $(vmrPath)
 
   - script: >
       $(Agent.BuildDirectory)/installer/.dotnet/dotnet darc vmr update
-      --vmr $(Agent.BuildDirectory)/vmr
+      --vmr $(vmrPath)
       --tmp $(Agent.TempDirectory)
       --azdev-pat $(System.AccessToken)
       --github-pat ${{ parameters.vmrToken }}
@@ -96,4 +100,4 @@ jobs:
         git branch --set-upstream-to=dotnet/${{ parameters.vmrBranch }} ${{ parameters.vmrBranch }} || echo 'Branch ${{ parameters.vmrBranch }} not found in remote'
         git push dotnet ${{ parameters.vmrBranch }}
       displayName: Push changes to dotnet/dotnet
-      workingDirectory: $(Agent.BuildDirectory)/vmr
+      workingDirectory: $(vmrPath)

eng/vmr-synchronization.yml

@@ -11,6 +11,11 @@ parameters:
   type: string
   default: $(Build.SourceBranchName)
 
+- name: noPush
+  displayName: Don't push changes to dotnet/dotnet
+  type: boolean
+  default: false
+
 trigger:
   branches:
     include:
@@ -39,3 +44,4 @@ jobs:
     targetRef: ${{ parameters.targetRef }}
     vmrBranch: ${{ parameters.vmrBranch }}
     vmrToken: $(BotAccount-dotnet-bot-repo-PAT)
+    noPush: ${{ parameters.noPush }}