Skip to content

Commit b0da3f2

Browse files
authored
Add cherry pick parameters to pipeline (#78178)
Validation - https://devdiv.visualstudio.com/DevDiv/_git/VS/pullrequest/629206
2 parents 6ddda90 + a7cc029 commit b0da3f2

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

azure-pipelines-official.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ parameters:
4444
type: boolean
4545
default: true
4646

47+
# An optional VS commit SHA that will be automatically cherry-picked
48+
# to the insertion PR created by this build.
49+
- name: VisualStudioCherryPickSHA
50+
type: string
51+
default: '(default)'
52+
4753
schedules:
4854
- cron: "0 8 23-29 * 0"
4955
displayName: "Monthly smoke test"
@@ -394,6 +400,7 @@ extends:
394400
publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
395401
publishDataAccessToken: "$(System.AccessToken)"
396402
dropPath: '$(Pipeline.Workspace)\VSSetup'
403+
cherryPick: ${{ parameters.VisualStudioCherryPickSHA }}
397404

398405
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
399406
- template: /eng/common/templates-official/post-build/post-build.yml@self

azure-pipelines-pr-validation.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ parameters:
2222
- name: OptionalTitlePrefix
2323
type: string
2424
default: '[PR Validation]'
25+
- name: VisualStudioCherryPickSHA
26+
type: string
27+
default: '(default)'
2528
- name: InsertToolset
2629
type: boolean
2730
default: true
@@ -323,6 +326,7 @@ extends:
323326
queueSpeedometerValidation: true
324327
dropPath: '$(Pipeline.Workspace)\VSSetup'
325328
retainInsertedBuild: false
329+
cherryPick: ${{ parameters.VisualStudioCherryPickSHA }}
326330
# Arcade is done so we can set BuildNumber back
327331
- powershell: Write-Host "##vso[build.updatebuildnumber]$(FancyBuildNumber)"
328332
displayName: Reset BuildNumber

eng/pipelines/insert.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ parameters:
5050
type: string
5151
default: ''
5252

53+
- name: cherryPick
54+
type: string
55+
5356
steps:
5457
- checkout: none
5558

@@ -183,7 +186,7 @@ steps:
183186
.\RIT\tools\net472\OneOffInsertion.ps1 `
184187
-autoComplete "$(Template.AutoComplete)" `
185188
-buildQueueName "$(Build.DefinitionName)" `
186-
-cherryPick "(default)" `
189+
-cherryPick "${{ parameters.cherryPick }}" `
187190
-userName "$(Template.BuildUserName)" `
188191
-password "$(Template.BuildPassword)" `
189192
-componentUserName "$(Template.ComponentUserName)" `

0 commit comments

Comments
 (0)