Skip to content

Commit

Permalink
Replace all Azure-Pipelines-EO-Windows2022-aiinfrat to Onnxruntime-Wi…
Browse files Browse the repository at this point in the history
…n-CPU-2022 (#18614)

### Description
Replace all Azure-Pipelines-EO-Windows2022-aiinfrat to
Onnxruntime-Win-CPU-2022


### Motivation and Context
Reduce the maintenance cost
  • Loading branch information
mszhanyi authored Nov 29, 2023
1 parent 38b640c commit 6820930
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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']]
Expand Down Expand Up @@ -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']]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/post-merge-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']]
Expand Down Expand Up @@ -225,4 +223,4 @@ stages:

- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
displayName: 'Clean Agent Directories'
condition: always()
condition: always()
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit 6820930

Please sign in to comment.