Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Nov 29, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4796be0
replace one old pool
mszhanyi Nov 29, 2023
09a1d03
rm useless comments
mszhanyi Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml
View file
Open in desktop
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
6 changes: 2 additions & 4 deletions tools/ci_build/github/azure-pipelines/stages/nuget-combine-cuda-stage.yml
View file
Open in desktop
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.
snnn marked this conversation as resolved.
Show resolved Hide resolved
# 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()
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/ondevice-training-cpu-packaging-pipeline.yml
View file
Open in desktop
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
Loading