diff options
| author | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2022-10-04 20:32:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 20:32:39 +0300 |
| commit | 93e6745413be6950b4ee9a1d3aea2b8772109eee (patch) | |
| tree | 86fd7e642d227b8cbd21617feb5ad88fbae5c773 | |
| parent | a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 (diff) | |
[release/7.0] Switch to consolidated Windows build images (#44350)
- incomplete w/o updates in spa-templates and a submodule update here
| -rw-r--r-- | .azure/pipelines/azure-pipelines-mirror-within-azdo.yml | 4 | ||||
| -rw-r--r-- | .azure/pipelines/ci.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml b/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml index 76ae879fb7..7d54550e8a 100644 --- a/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml +++ b/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml @@ -4,7 +4,7 @@ trigger: branches: include: - internal/release/6.0 - + parameters: # Run the pipeline manually (usually disallowed) - name: manualRun @@ -27,7 +27,7 @@ jobs: enableSBOM: false pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals 1es-windows-2019 variables: - name: WorkingDirectoryName value: repo-dir diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index c04e6ed77d..3ac92b9a12 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -757,7 +757,7 @@ stages: - Source_Build_Managed pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals 1es-windows-2019 publishUsingPipelines: ${{ variables._PublishUsingPipelines }} enablePublishBuildArtifacts: true # publish artifacts/log files - ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: @@ -796,7 +796,7 @@ stages: pool: name: NetCore1ESPool-Svc-Internal # Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals 1es-windows-2019 steps: - task: DownloadBuildArtifacts@0 inputs: |