Skip to content

Commit 30814e8

Browse files
pwshBotTravisEz13
andauthored
[release/v7.5] Make logical template name consistent between pipelines (#25991)
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
1 parent cbfecf7 commit 30814e8

6 files changed

+11
-11
lines changed

.pipelines/MSIXBundle-vPack-Official.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ variables:
2929

3030
resources:
3131
repositories:
32-
- repository: templates
32+
- repository: onebranchTemplates
3333
type: git
3434
name: OneBranch.Pipelines/GovernedTemplates
3535
ref: refs/heads/main
@@ -44,7 +44,7 @@ resources:
4444
- releases/*
4545

4646
extends:
47-
template: v2/Microsoft.Official.yml@templates
47+
template: v2/Microsoft.Official.yml@onebranchTemplates
4848
parameters:
4949
platform:
5050
name: 'windows_undocked' # windows undocked

.pipelines/PowerShell-Coordinated_Packages-Official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
name: bins-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
21
trigger: none
32

43
parameters:
@@ -30,6 +29,7 @@ parameters:
3029
type: boolean
3130
default: false
3231

32+
name: bins-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)
3333

3434
resources:
3535
repositories:

.pipelines/PowerShell-Packages-Official.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
2828
type: boolean
2929
default: false
3030

31-
name: pkgs-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
31+
name: pkgs-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)
3232

3333
variables:
3434
- name: CDP_DEFINITION_BUILD_COUNT
@@ -78,7 +78,7 @@ resources:
7878
- releases/*
7979

8080
repositories:
81-
- repository: templates
81+
- repository: onebranchTemplates
8282
type: git
8383
name: OneBranch.Pipelines/GovernedTemplates
8484
ref: refs/heads/main

.pipelines/PowerShell-Release-Official-Azure.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
1717
type: boolean
1818
default: false
1919

20-
name: ev2-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
20+
name: ev2-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)
2121

2222
variables:
2323
- name: CDP_DEFINITION_BUILD_COUNT
@@ -54,7 +54,7 @@ variables:
5454

5555
resources:
5656
repositories:
57-
- repository: templates
57+
- repository: onebranchTemplates
5858
type: git
5959
name: OneBranch.Pipelines/GovernedTemplates
6060
ref: refs/heads/main

.pipelines/PowerShell-Release-Official.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
2929
type: boolean
3030
default: false
3131

32-
name: release-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
32+
name: release-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)
3333

3434
variables:
3535
- name: CDP_DEFINITION_BUILD_COUNT
@@ -71,7 +71,7 @@ variables:
7171

7272
resources:
7373
repositories:
74-
- repository: templates
74+
- repository: onebranchTemplates
7575
type: git
7676
name: OneBranch.Pipelines/GovernedTemplates
7777
ref: refs/heads/main

.pipelines/PowerShell-vPack-Official.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ variables:
5050
- group: Azure Blob variable group
5151
- group: certificate_logical_to_actual # used within signing task
5252
- name: templateFile
53-
value: ${{ iif ( parameters.OfficialBuild, 'v2/Microsoft.Official.yml@templates', 'v2/Microsoft.NonOfficial.yml@templates' ) }}
53+
value: ${{ iif ( parameters.OfficialBuild, 'v2/Microsoft.Official.yml@onebranchTemplates', 'v2/Microsoft.NonOfficial.yml@onebranchTemplates' ) }}
5454
- group: DotNetPrivateBuildAccess
5555
- group: certificate_logical_to_actual
5656
# We shouldn't be using PATs anymore
5757
# - group: mscodehub-feed-read-general
5858

5959
resources:
6060
repositories:
61-
- repository: templates
61+
- repository: onebranchTemplates
6262
type: git
6363
name: OneBranch.Pipelines/GovernedTemplates
6464
ref: refs/heads/main

0 commit comments

Comments
 (0)