Skip to content

Commit ccd4a63

Browse files
committed
Update pipelines in response to eng/docker-tools breaking changes
1 parent 6471be6 commit ccd4a63

2 files changed

Lines changed: 4 additions & 13 deletions

File tree

eng/pipelines/stages/dotnet-framework-base.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,6 @@ parameters:
2323

2424

2525
stages:
26-
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
27-
- template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
28-
parameters:
29-
publishConfig: ${{ parameters.publishConfig }}
30-
usesRegistries:
31-
- ${{ parameters.publishConfig.InternalMirrorRegistry.server }}
32-
- ${{ parameters.publishConfig.BuildRegistry.server }}
33-
- ${{ parameters.publishConfig.PublishRegistry.server }}
34-
serviceConnections:
35-
- ${{ each serviceConnection in parameters.additionalServiceConnections }}:
36-
- name: ${{ serviceConnection.name }}
37-
3826
- template: /eng/docker-tools/templates/stages/dotnet/build-test-publish-repo.yml@self
3927
parameters:
4028
publishConfig: ${{ parameters.publishConfig }}
@@ -43,6 +31,7 @@ stages:
4331
versionsRepoRef: ${{ parameters.versionsRepoRef }}
4432
sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
4533
noCache: ${{ parameters.noCache }}
34+
additionalServiceConnections: ${{ parameters.additionalServiceConnections }}
4635

4736
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
4837
windowsAmdBuildJobTimeout: 330

eng/pipelines/update-readmes.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ extends:
1616
- job: UpdateReadmes
1717
displayName: Update Readmes
1818
steps:
19-
- template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self
19+
- template: /eng/docker-tools/templates/steps/init-common.yml@self
20+
parameters:
21+
dockerClientOS: linux
2022
- template: /eng/docker-tools/templates/steps/publish-readmes.yml@self
2123
- template: /eng/docker-tools/templates/steps/cleanup-docker-linux.yml@self

0 commit comments

Comments
 (0)