From 68209307daadfe21a74a36d44c4c170b91141772 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Thu, 30 Nov 2023 02:32:42 +0800 Subject: [PATCH] Replace all Azure-Pipelines-EO-Windows2022-aiinfrat to Onnxruntime-Win-CPU-2022 (#18614) ### Description Replace all Azure-Pipelines-EO-Windows2022-aiinfrat to Onnxruntime-Win-CPU-2022 ### Motivation and Context Reduce the maintenance cost --- .../azure-pipelines/c-api-noopenmp-packaging-pipelines.yml | 4 ++-- .../github/azure-pipelines/npm-packaging-pipeline.yml | 4 ++-- tools/ci_build/github/azure-pipelines/post-merge-jobs.yml | 2 +- .../github/azure-pipelines/py-package-test-pipeline.yml | 2 +- .../azure-pipelines/stages/nuget-combine-cuda-stage.yml | 6 ++---- .../templates/ondevice-training-cpu-packaging-pipeline.yml | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) 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 67fa78da003a3..db1dcc3af792e 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 @@ -673,7 +673,7 @@ stages: clean: all # we need to use the 2022 pool to create the nuget package with both pre-net6+Xamarin and net6 targets. # VS2019 has no support for net6 and we need to use msbuild (from the VS install) to do the packing - pool: 'Azure-Pipelines-EO-Windows2022-aiinfra' + pool: 'Onnxruntime-Win-CPU-2022' variables: breakCodesignValidationInjection: ${{ parameters.DoEsrp }} ReleaseVersionSuffix: $[stageDependencies.Setup.Set_Variables.outputs['Set_Release_Version_Suffix.ReleaseVersionSuffix']] @@ -858,7 +858,7 @@ stages: clean: all # we need to use the 2022 pool to create the nuget package with both pre-net6+Xamarin and net6 targets. # VS2019 has no support for net6 and we need to use msbuild (from the VS install) to do the packing - pool: 'Azure-Pipelines-EO-Windows2022-aiinfra' + pool: 'Onnxruntime-Win-CPU-2022' variables: breakCodesignValidationInjection: ${{ parameters.DoEsrp }} ReleaseVersionSuffix: $[stageDependencies.Setup.Set_Variables.outputs['Set_Release_Version_Suffix.ReleaseVersionSuffix']] diff --git a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml index b98837078b2d5..fd26128b8b29a 100644 --- a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml @@ -48,7 +48,7 @@ stages: RunWebGpuTestsForDebugBuild: false RunWebGpuTestsForReleaseBuild: true WebGpuPoolName: 'onnxruntime-Win2022-webgpu-A10' - WebCpuPoolName: 'Azure-Pipelines-EO-Windows2022-aiinfra' + WebCpuPoolName: 'Onnxruntime-Win-CPU-2022' - template: templates/react-native-ci.yml parameters: @@ -65,7 +65,7 @@ stages: - Build_web_Debug jobs: - job: Download_Node_Package_And_Publish_Validation_Script - pool: 'Azure-Pipelines-EO-Windows2022-aiinfra' + pool: 'Onnxruntime-Win-CPU-2022' variables: runCodesignValidationInjection: false timeoutInMinutes: 10 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 c86920422b6f0..706c87fc079ca 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -8,7 +8,7 @@ stages: BuildStaticLib: true ExtraBuildArgs: '' UseWebPoolName: true - WebCpuPoolName: 'Azure-Pipelines-EO-Windows2022-aiinfra' + WebCpuPoolName: 'Onnxruntime-Win-CPU-2022' # This stage is to test if the combined build works on # o Windows ARM64 diff --git a/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml index c8aac6e8b130d..55d3150f21aa3 100644 --- a/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml @@ -84,7 +84,7 @@ stages: skipComponentGovernanceDetection: true workspace: clean: all - pool: Azure-Pipelines-EO-Windows2022-aiinfra + pool: Onnxruntime-Win-CPU-2022 steps: - task: PowerShell@2 displayName: 'Add Build Tag' diff --git a/tools/ci_build/github/azure-pipelines/stages/nuget-combine-cuda-stage.yml b/tools/ci_build/github/azure-pipelines/stages/nuget-combine-cuda-stage.yml index b69e75856c39f..d009e15559180 100644 --- a/tools/ci_build/github/azure-pipelines/stages/nuget-combine-cuda-stage.yml +++ b/tools/ci_build/github/azure-pipelines/stages/nuget-combine-cuda-stage.yml @@ -27,9 +27,7 @@ stages: - job: workspace: clean: all - # we need to use the 2022 pool to create the nuget package with both pre-net6+Xamarin and net6 targets. - # VS2019 has no support for net6 and we need to use msbuild (from the VS install) to do the packing - pool: 'Azure-Pipelines-EO-Windows2022-aiinfra' + pool: 'Onnxruntime-Win-CPU-2022' variables: breakCodesignValidationInjection: ${{ parameters.DoEsrp }} ReleaseVersionSuffix: $[stageDependencies.Setup.Set_Variables.outputs['Set_Release_Version_Suffix.ReleaseVersionSuffix']] @@ -225,4 +223,4 @@ stages: - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 displayName: 'Clean Agent Directories' - condition: always() \ No newline at end of file + condition: always() 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 24e46066a1f10..29cea63df1662 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 @@ -141,7 +141,7 @@ stages: clean: all # we need to use the 2022 pool to create the nuget package with both pre-net6+Xamarin and net6 targets. # VS2019 has no support for net6 and we need to use msbuild (from the VS install) to do the packing - pool: 'Azure-Pipelines-EO-Windows2022-aiinfra' + pool: 'Onnxruntime-Win-CPU-2022' variables: OrtPackageId: ${{ parameters.OrtNugetPackageId }} breakCodesignValidationInjection: ${{ parameters.DoEsrp }}