Prechádzať zdrojové kódy

[main] Switch to consolidated Windows build images (#44351)

Doug Bunting 3 rokov pred
rodič
commit
d14dd282af

+ 2 - 2
.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-Internal
-          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+          demands: ImageOverride -equals 1es-windows-2019
         variables:
         - name: WorkingDirectoryName
           value: repo-dir

+ 2 - 2
.azure/pipelines/ci.yml

@@ -762,7 +762,7 @@ stages:
           - Source_Build_Managed
         pool:
           name: NetCore1ESPool-Internal
-          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+          demands: ImageOverride -equals 1es-windows-2019
         publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
         enablePublishBuildArtifacts: true # publish artifacts/log files
         publishAssetsImmediately: true # Don't use a separate stage for darc publishing.
@@ -802,7 +802,7 @@ stages:
         pool:
           name: NetCore1ESPool-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: