diff --git a/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml b/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml index ba3b2b0ba7..5af27815cb 100644 --- a/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml +++ b/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml @@ -229,7 +229,7 @@ stages: - job: workspace: clean: all - pool: 'Win-CPU-2021' + pool: 'onnxruntime-Win-CPU-2022' steps: @@ -790,7 +790,7 @@ stages: SpecificArtifact: ${{ parameters.specificArtifact }} BuildId: ${{ parameters.BuildId }} -- template: nuget/templates/dml-vs-2019.yml +- template: nuget/templates/dml-vs-2022.yml parameters: AgentPool : 'aiinfra-dml-winbuild' IsReleaseBuild: ${{ parameters.IsReleaseBuild }} @@ -813,7 +813,7 @@ stages: mkdir $(Build.ArtifactStagingDirectory)\testdata copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata -- template: nuget/templates/dml-vs-2019.yml +- template: nuget/templates/dml-vs-2022.yml parameters: AgentPool : 'aiinfra-dml-winbuild' IsReleaseBuild: ${{ parameters.IsReleaseBuild }} @@ -836,9 +836,9 @@ stages: mkdir $(Build.ArtifactStagingDirectory)\testdata copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata -- template: nuget/templates/dml-vs-2019.yml +- template: nuget/templates/dml-vs-2022.yml parameters: - AgentPool : 'Win-CPU-2021' + AgentPool : 'onnxruntime-Win-CPU-2022' IsReleaseBuild: ${{ parameters.IsReleaseBuild }} ArtifactName: 'drop-win-dml-arm64-zip' StageName: 'Windows_CI_GPU_DML_Dev_arm64' @@ -859,9 +859,9 @@ stages: mkdir $(Build.ArtifactStagingDirectory)\testdata copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata -- template: nuget/templates/dml-vs-2019.yml +- template: nuget/templates/dml-vs-2022.yml parameters: - AgentPool : 'Win-CPU-2021' + AgentPool : 'onnxruntime-Win-CPU-2022' IsReleaseBuild: ${{ parameters.IsReleaseBuild }} ArtifactName: 'drop-win-dml-arm-zip' StageName: 'Windows_CI_GPU_DML_Dev_arm' diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2019.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2022.yml similarity index 96% rename from tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2019.yml rename to tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2022.yml index cc9195f783..8e62d98052 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2019.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2022.yml @@ -12,7 +12,7 @@ parameters: BuildArch: 'x64' # Optional. Options: x86, x64 sln_platform: 'x64' # Options: Win32, x64, arm, arm64 EnvSetupScript: 'setup_env.bat' - AgentPool: 'Win-CPU-2021' + AgentPool: 'onnxruntime-Win-CPU-2022' AgentDemands: [] OrtPackageId: Microsoft.ML.OnnxRuntime BuildConfigurations: ['RelWithDebInfo'] # Options: Debug, RelWithDebInfo @@ -185,9 +185,9 @@ stages: # Nuget packaging if needed - ${{ if eq(parameters['DoNugetPack'], 'true') }}: - task: BatchScript@1 - displayName: 'Setup VS2019 env vars' + displayName: 'Setup VS2022 env vars' inputs: - filename: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat' + filename: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat' arguments: ${{ parameters.BuildArch }} modifyEnvironment: true # Esrp signing @@ -227,9 +227,9 @@ stages: # Node.js Publish - ${{ if eq(parameters['DoNodejsPack'], 'true') }}: - task: BatchScript@1 - displayName: 'Setup VS2019 env vars' + displayName: 'Setup VS2022 env vars' inputs: - filename: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat' + filename: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat' arguments: ${{ parameters.BuildArch }} modifyEnvironment: true - template: ../../templates/win-esrp-dll.yml diff --git a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml index 4dde8ba6b1..fe819c8310 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -1,11 +1,6 @@ variables: -- name: WIN_CPU_BUILD_MACHINE_POOL_NAME # name of a variable - # The public ADO project - ${{ if startsWith(variables['System.CollectionUri'], 'https://dev.azure.com/onnxruntime/') }}: - value: 'onnxruntime-Win-CPU-2022' - # The private ADO project - ${{ if or(startsWith(variables['System.CollectionUri'], 'https://dev.azure.com/aiinfra/'),startsWith(variables['System.CollectionUri'], 'https://aiinfra.visualstudio.com/')) }}: - value: 'Win-CPU-2021' +- name: WIN_CPU_BUILD_MACHINE_POOL_NAME + value: 'onnxruntime-Win-CPU-2022' - name: LINUX_CPU_BUILD_MACHINE_POOL_NAME # name of a variable # The public ADO project ${{ if startsWith(variables['System.CollectionUri'], 'https://dev.azure.com/onnxruntime/') }}: diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml index 6b79f2d33d..e91fd6ade4 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -212,7 +212,7 @@ stages: - job: workspace: clean: all - pool: 'Win-CPU-2021' + pool: 'onnxruntime-Win-CPU-2022' steps: - checkout: self @@ -533,7 +533,7 @@ stages: - job: workspace: clean: all - pool: 'Win-CPU-2021' + pool: 'onnxruntime-Win-CPU-2022' variables: ${{ if eq(parameters.IsReleaseBuild, true) }}: NpmPackagingMode: 'release' @@ -772,7 +772,7 @@ stages: - template: ../nuget/templates/test_win.yml parameters: - AgentPool : 'Win-CPU-2021' + AgentPool : 'onnxruntime-Win-CPU-2022' Skipx86Tests : false NugetPackageName : 'Microsoft.ML.OnnxRuntime' ArtifactSuffix: 'CPU' @@ -792,7 +792,7 @@ stages: - template: ../nodejs/templates/test_win.yml parameters: - AgentPool : 'Win-CPU-2021' + AgentPool : 'onnxruntime-Win-CPU-2022' StageSuffix : 'Win_CPU_x64' - template: ../nodejs/templates/test_linux.yml @@ -810,7 +810,7 @@ stages: - job: workspace: clean: all - pool: 'Win-CPU-2021' + pool: 'onnxruntime-Win-CPU-2022' timeoutInMinutes: 60 variables: - name: runCodesignValidationInjection diff --git a/tools/ci_build/github/azure-pipelines/templates/ondevice-training-cpu-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/templates/ondevice-training-cpu-packaging-pipeline.yml index dcab3c83b1..539fb9b268 100644 --- a/tools/ci_build/github/azure-pipelines/templates/ondevice-training-cpu-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/templates/ondevice-training-cpu-packaging-pipeline.yml @@ -354,7 +354,7 @@ stages: - template: ../nuget/templates/test_win.yml parameters: - AgentPool : 'Win-CPU-2021' + AgentPool : 'onnxruntime-Win-CPU-2022' Skipx86Tests : false NugetPackageName : 'Microsoft.ML.OnnxRuntime.Training' ArtifactSuffix: 'Training-CPU' diff --git a/tools/ci_build/github/azure-pipelines/templates/publish-nuget.yml b/tools/ci_build/github/azure-pipelines/templates/publish-nuget.yml index 8d4a4d2c5a..76fbf55331 100644 --- a/tools/ci_build/github/azure-pipelines/templates/publish-nuget.yml +++ b/tools/ci_build/github/azure-pipelines/templates/publish-nuget.yml @@ -22,7 +22,7 @@ stages: variables: - name: GDN_CODESIGN_TARGETDIRECTORY value: '$(Build.BinariesDirectory)/nuget-artifact/final-package' - pool: 'Win-CPU-2021' + pool: 'onnxruntime-Win-CPU-2022' steps: - checkout: self diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index bdac1a7e3b..82d56688c4 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -52,7 +52,7 @@ stages: jobs: - ${{ if eq(parameters.enable_windows_cpu, true) }}: - job: Windows_py_Wheels - pool: 'Win-CPU-2021' + pool: 'onnxruntime-Win-CPU-2022' strategy: matrix: Python38_x64: diff --git a/tools/ci_build/github/azure-pipelines/templates/upload-code-coverage-data.yml b/tools/ci_build/github/azure-pipelines/templates/upload-code-coverage-data.yml index 0a94aa7b0f..c70c4e1ebe 100644 --- a/tools/ci_build/github/azure-pipelines/templates/upload-code-coverage-data.yml +++ b/tools/ci_build/github/azure-pipelines/templates/upload-code-coverage-data.yml @@ -2,7 +2,7 @@ jobs: - job: Upload workspace: clean: all - pool: 'Win-CPU-2021' + pool: 'onnxruntime-Win-CPU-2022' variables: - name: runCodesignValidationInjection value: false diff --git a/tools/ci_build/github/azure-pipelines/templates/win-ci.yml b/tools/ci_build/github/azure-pipelines/templates/win-ci.yml index 85f155b35b..f15bcb2030 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-ci.yml @@ -51,7 +51,7 @@ parameters: - name: ort_build_pool_name type: string - default: 'Win-CPU-2021' + default: 'onnxruntime-Win-CPU-2022' #'onnxruntime' or 'onnxruntime_gpu' - name: java_artifact_id diff --git a/tools/ci_build/github/azure-pipelines/web-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/web-packaging-pipeline.yml index 236f5bda89..5f32c7b2b9 100644 --- a/tools/ci_build/github/azure-pipelines/web-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/web-packaging-pipeline.yml @@ -28,4 +28,4 @@ stages: parameters: NpmPackagingMode: ${{ variables.NpmPackagingMode }} IsReleasePipeline: true - PoolName: 'Win-CPU-2021' \ No newline at end of file + PoolName: 'onnxruntime-Win-CPU-2022' \ No newline at end of file diff --git a/tools/ci_build/github/azure-pipelines/win-ci-fuzz-testing.yml b/tools/ci_build/github/azure-pipelines/win-ci-fuzz-testing.yml index 3c739a52f9..0eb78412de 100644 --- a/tools/ci_build/github/azure-pipelines/win-ci-fuzz-testing.yml +++ b/tools/ci_build/github/azure-pipelines/win-ci-fuzz-testing.yml @@ -1,6 +1,6 @@ jobs: - job: 'build' - pool: 'Win-CPU-2021' + pool: 'onnxruntime-Win-CPU-2022' strategy: maxParallel: 2 matrix: