Skip to content

Commit f88a1e2

Browse files
committed
Migrate to new service connections config format
1 parent 88f12b1 commit f88a1e2

3 files changed

Lines changed: 18 additions & 12 deletions

File tree

eng/pipelines/stages/build-and-test.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ stages:
4444
- ${{ if parameters.isStandaloneBuild }}:
4545
- template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
4646
parameters:
47+
publishConfig: ${{ parameters.publishConfig }}
48+
usesRegistries:
49+
- ${{ parameters.publishConfig.InternalMirrorRegistry.server }}
50+
- ${{ parameters.publishConfig.BuildRegistry.server }}
4751
serviceConnections:
48-
- name: ${{ parameters.publishConfig.InternalMirrorRegistry.serviceConnection.name }}
49-
- name: ${{ parameters.publishConfig.BuildRegistry.serviceConnection.name }}
50-
- ${{ if parameters.storageAccountServiceConnection }}:
51-
- name: ${{ parameters.storageAccountServiceConnection.name }}
52+
- ${{ if parameters.storageAccountServiceConnection }}:
53+
- name: ${{ parameters.storageAccountServiceConnection.name }}
5254

5355
- template: /eng/docker-tools/templates/stages/dotnet/build-and-test.yml@self
5456
parameters:

eng/pipelines/stages/build-test-publish-repo.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@ stages:
3636
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
3737
- template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
3838
parameters:
39+
publishConfig: ${{ parameters.publishConfig }}
40+
usesRegistries:
41+
- ${{ parameters.publishConfig.InternalMirrorRegistry.server }}
42+
- ${{ parameters.publishConfig.BuildRegistry.server }}
43+
- ${{ parameters.publishConfig.PublishRegistry.server }}
3944
serviceConnections:
40-
- name: ${{ parameters.publishConfig.InternalMirrorRegistry.serviceConnection.name }}
41-
- name: ${{ parameters.publishConfig.BuildRegistry.serviceConnection.name }}
42-
- name: ${{ parameters.publishConfig.PublishRegistry.serviceConnection.name }}
43-
- ${{ each serviceConnection in parameters.additionalServiceConnections }}:
44-
- name: ${{ serviceConnection.name }}
45+
- ${{ each serviceConnection in parameters.additionalServiceConnections }}:
46+
- name: ${{ serviceConnection.name }}
4547

4648
- template: /eng/pipelines/stages/build-and-test.yml@self
4749
parameters:

eng/pipelines/stages/publish.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@ stages:
3939
- ${{ if parameters.isStandalonePublish }}:
4040
- template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
4141
parameters:
42+
publishConfig: ${{ parameters.publishConfig }}
43+
usesRegistries:
44+
- ${{ parameters.publishConfig.PublishRegistry.server }}
4245
serviceConnections:
43-
- name: ${{ parameters.publishConfig.PublishRegistry.serviceConnection.name }}
44-
- ${{ each serviceConnection in parameters.additionalServiceConnections }}:
45-
- name: ${{ serviceConnection.name }}
46+
- ${{ each serviceConnection in parameters.additionalServiceConnections }}:
47+
- name: ${{ serviceConnection.name }}
4648

4749
- template: /eng/docker-tools/templates/stages/dotnet/publish.yml@self
4850
parameters:

0 commit comments

Comments
 (0)