Skip to content

Commit 0844d9e

Browse files
committed
Add cherry pick parameters to pipeline
1 parent 89219d1 commit 0844d9e

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

azure-pipelines-official.yml

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

47+
- name: VisualStudioCherryPickSHA
48+
type: string
49+
default: ''
50+
4751
schedules:
4852
- cron: "0 8 23-29 * 0"
4953
displayName: "Monthly smoke test"
@@ -394,6 +398,7 @@ extends:
394398
publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
395399
publishDataAccessToken: "$(System.AccessToken)"
396400
dropPath: '$(Pipeline.Workspace)\VSSetup'
401+
cherryPick: ${{ parameters.VisualStudioCherryPickSHA }}
397402

398403
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
399404
- 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: ''
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: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ parameters:
5050
type: string
5151
default: ''
5252

53+
- name: cherryPick
54+
type: string
55+
default: ''
56+
5357
steps:
5458
- checkout: none
5559

@@ -183,7 +187,7 @@ steps:
183187
.\RIT\tools\net472\OneOffInsertion.ps1 `
184188
-autoComplete "$(Template.AutoComplete)" `
185189
-buildQueueName "$(Build.DefinitionName)" `
186-
-cherryPick "(default)" `
190+
-cherryPick "${{ coalesce(parameters.cherryPick, '(default)') }}" `
187191
-userName "$(Template.BuildUserName)" `
188192
-password "$(Template.BuildPassword)" `
189193
-componentUserName "$(Template.ComponentUserName)" `

0 commit comments

Comments
 (0)