diff --git a/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml b/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml index 3ddc167bc0..d37e9bdc5d 100644 --- a/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml @@ -28,7 +28,7 @@ stages: artifactName: 'onnxruntime-android-full-aar' job_name_suffix: 'Full' publish_executables: '1' - pool_name: 'onnxruntime-Ubuntu2004-AMD-CPU' + pool_name: 'onnxruntime-Ubuntu2204-AMD-CPU' # build Python packages # Linux GPU only 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 2169a3ce1b..3803333bd8 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 @@ -246,7 +246,7 @@ stages: workspace: clean: all timeoutInMinutes: 120 - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU variables: RocmVersion: '5.6' steps: diff --git a/tools/ci_build/github/azure-pipelines/clean-build-docker-image-cache-pipeline.yml b/tools/ci_build/github/azure-pipelines/clean-build-docker-image-cache-pipeline.yml index 24086b6166..43e668eef8 100644 --- a/tools/ci_build/github/azure-pipelines/clean-build-docker-image-cache-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/clean-build-docker-image-cache-pipeline.yml @@ -19,8 +19,7 @@ variables: jobs: - job: Clean_Build_Docker_Image_Cache - pool: - vmImage: 'ubuntu-20.04' + pool: onnxruntime-Ubuntu2204-AMD-CPU timeoutInMinutes: 30 @@ -29,13 +28,6 @@ jobs: submodules: false fetchDepth: 1 - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.9' - addToPath: true - architecture: 'x64' - displayName: "Use Python 3.9" - - task: AzureCLI@2 inputs: azureSubscription: 'AIInfraBuild' diff --git a/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml index df7b5f59d2..1d2ba88652 100644 --- a/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml @@ -126,7 +126,7 @@ stages: BaseImage: 'registry.access.redhat.com/ubi8/ubi' OnnxruntimeArch: 'x64' OnnxruntimeNodejsBindingArch: 'x64' - PoolName: 'onnxruntime-Ubuntu2004-AMD-CPU' + PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU' PackageJava: false PackageNodeJS: false # Nuget Packaging diff --git a/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml index 07f672c75d..cff7c96aa9 100644 --- a/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml @@ -46,7 +46,7 @@ stages: skipComponentGovernanceDetection: true ORT_CACHE_DIR: $(Agent.TempDirectory)/ort_ccache TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU steps: - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 displayName: 'Clean Agent Directories' @@ -123,7 +123,7 @@ stages: skipComponentGovernanceDetection: true ORT_CACHE_DIR: $(Agent.TempDirectory)/ort_ccache TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU steps: - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 displayName: 'Clean Agent Directories' diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml index 146186e9ee..090ce97296 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml @@ -43,7 +43,7 @@ jobs: variables: CCACHE_DIR: $(Agent.TempDirectory)/ccache TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU steps: - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 displayName: 'Clean Agent Directories' diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml index a5c08e95b7..d3d13cc534 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml @@ -51,7 +51,7 @@ jobs: timeoutInMinutes: 120 workspace: clean: all - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU steps: - checkout: self clean: true diff --git a/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml index 0993a81a02..5bc8c3603e 100644 --- a/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml @@ -64,7 +64,7 @@ jobs: CCACHE_DIR: $(Pipeline.Workspace)/ccache workspace: clean: all - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU steps: - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 displayName: 'Clean Agent Directories' diff --git a/tools/ci_build/github/azure-pipelines/linux-migraphx-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-migraphx-ci-pipeline.yml index f7571a3b7e..9cf7a3fb42 100644 --- a/tools/ci_build/github/azure-pipelines/linux-migraphx-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-migraphx-ci-pipeline.yml @@ -46,7 +46,7 @@ jobs: TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] workspace: clean: all - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU timeoutInMinutes: 120 steps: 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 7f73da23b5..21fc205c72 100644 --- a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml @@ -41,7 +41,7 @@ stages: parameters: NpmPackagingMode: ${{ variables.NpmPackagingMode }} IsReleasePipeline: true - PoolName: 'onnxruntime-Ubuntu2004-AMD-CPU' + PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU' PackageName: 'onnxruntime-web' ExtraBuildArgs: '' UseWebPoolName: true @@ -54,7 +54,7 @@ stages: parameters: NpmPackagingMode: ${{ variables.NpmPackagingMode }} BuildConfig: 'Release' - PoolName: 'onnxruntime-Ubuntu2004-AMD-CPU' + PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU' PackageName: 'onnxruntime-react-native' BuildAndroidAARStageDependsOn: 'Precheck_and_extract_commit' diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/test_linux.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/test_linux.yml index f44106c145..2567bec9fd 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/test_linux.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/test_linux.yml @@ -1,5 +1,5 @@ parameters: - AgentPool: 'onnxruntime-Ubuntu2004-AMD-CPU' + AgentPool: 'onnxruntime-Ubuntu2204-AMD-CPU' ArtifactSuffix: '' NugetPackageName : '' StageSuffix: 'CPU' diff --git a/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml index 018672e0b2..26fd5e1ec0 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml @@ -44,7 +44,7 @@ jobs: skipComponentGovernanceDetection: true CCACHE_DIR: $(Pipeline.Workspace)/ccache TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] - pool: onnxruntime-Ubuntu-2004-Training-CPU + pool: onnxruntime-Ubuntu-2204-Training-CPU steps: - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 displayName: 'Clean Agent Directories' diff --git a/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml index a53f91fb31..71b224b659 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml @@ -37,7 +37,7 @@ jobs: TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] workspace: clean: all - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU timeoutInMinutes: 120 steps: @@ -132,7 +132,7 @@ jobs: TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] workspace: clean: all - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU timeoutInMinutes: 120 steps: diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml index 817ace0571..a44a8c2159 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml @@ -16,7 +16,7 @@ stages: timeoutInMinutes: 180 workspace: clean: all - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU strategy: matrix: 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 5ee3987673..3ec5400dac 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -4,7 +4,7 @@ stages: parameters: NpmPackagingMode: 'dev' IsReleasePipeline: true - PoolName: 'onnxruntime-Ubuntu2004-AMD-CPU' + PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU' BuildStaticLib: true ExtraBuildArgs: '' UseWebPoolName: true @@ -367,7 +367,7 @@ stages: timeoutInMinutes: 150 variables: skipComponentGovernanceDetection: true - pool: 'onnxruntime-Ubuntu2004-AMD-CPU' + pool: 'onnxruntime-Ubuntu2204-AMD-CPU' steps: - template: templates/set-version-number-variables-step.yml @@ -413,7 +413,7 @@ stages: - job: AndroidCustomBuildScript workspace: clean: all - pool: 'onnxruntime-Ubuntu2004-AMD-CPU' + pool: 'onnxruntime-Ubuntu2204-AMD-CPU' variables: dockerImageTag: onnxruntime-android-custom-build steps: 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 55d3150f21..04f555deb1 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 @@ -18,7 +18,7 @@ stages: - template: templates/py-packaging-linux-test-cpu.yml parameters: arch: 'x86_64' - machine_pool: 'onnxruntime-Ubuntu2004-AMD-CPU' + machine_pool: 'onnxruntime-Ubuntu2204-AMD-CPU' base_image: 'registry.access.redhat.com/ubi8/ubi' devtoolset_rootpath: /opt/rh/gcc-toolset-12/root ld_library_path_arg: /opt/rh/gcc-toolset-12/root/usr/lib64:/opt/rh/gcc-toolset-12/root/usr/lib:/opt/rh/gcc-toolset-12/root/usr/lib64/dyninst:/opt/rh/gcc-toolset-12/root/usr/lib/dyninst:/usr/local/lib64 diff --git a/tools/ci_build/github/azure-pipelines/stages/py-cuda-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/stages/py-cuda-packaging-stage.yml index e6d8ee35e7..f82c80d4d7 100644 --- a/tools/ci_build/github/azure-pipelines/stages/py-cuda-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/stages/py-cuda-packaging-stage.yml @@ -105,7 +105,7 @@ stages: - template: ../templates/py-linux-gpu.yml parameters: arch: 'x86_64' - machine_pool: 'onnxruntime-Ubuntu2004-AMD-CPU' + machine_pool: 'onnxruntime-Ubuntu2204-AMD-CPU' extra_build_arg: ${{ parameters.build_py_parameters }} cmake_build_type: ${{ parameters.cmake_build_type }} docker_base_image: ${{ variables.docker_base_image }} diff --git a/tools/ci_build/github/azure-pipelines/stages/py-cuda-publishing-stage.yml b/tools/ci_build/github/azure-pipelines/stages/py-cuda-publishing-stage.yml index 4f440e0f61..2a4debcf9f 100644 --- a/tools/ci_build/github/azure-pipelines/stages/py-cuda-publishing-stage.yml +++ b/tools/ci_build/github/azure-pipelines/stages/py-cuda-publishing-stage.yml @@ -20,7 +20,7 @@ stages: dependsOn: [] jobs: - job: - pool: 'onnxruntime-Ubuntu2004-AMD-CPU' + pool: 'onnxruntime-Ubuntu2204-AMD-CPU' steps: - checkout: none - task: DownloadPipelineArtifact@2 diff --git a/tools/ci_build/github/azure-pipelines/templates/android-java-api-aar.yml b/tools/ci_build/github/azure-pipelines/templates/android-java-api-aar.yml index 5e61f88b4a..509fea45eb 100644 --- a/tools/ci_build/github/azure-pipelines/templates/android-java-api-aar.yml +++ b/tools/ci_build/github/azure-pipelines/templates/android-java-api-aar.yml @@ -33,7 +33,7 @@ parameters: - name: pool_name displayName: Pool name type: string - default: 'onnxruntime-Ubuntu2004-AMD-CPU' + default: 'onnxruntime-Ubuntu2204-AMD-CPU' - name: packageName # now we can build onnxruntime or onnxruntime-mobile for Android, need specify it here diff --git a/tools/ci_build/github/azure-pipelines/templates/build-linux-wasm-step.yml b/tools/ci_build/github/azure-pipelines/templates/build-linux-wasm-step.yml index e664cf69de..e77b1a4008 100644 --- a/tools/ci_build/github/azure-pipelines/templates/build-linux-wasm-step.yml +++ b/tools/ci_build/github/azure-pipelines/templates/build-linux-wasm-step.yml @@ -24,19 +24,17 @@ parameters: type: string steps: - - task: Cache@2 - inputs: - ${{if eq(variables['Build.SourceBranchName'], 'merge')}}: - key: ' "${{parameters.TODAY}}" | ${{parameters.AdditionalKey}} | merge ' - ${{else}}: - key: '"${{parameters.TODAY}}" | ${{parameters.AdditionalKey}} | $(Build.SourceVersion) ' - path: ${{parameters.CacheDir}} - restoreKeys: | - "${{parameters.TODAY}}" | ${{parameters.AdditionalKey}} - displayName: Cache Task - condition: eq('${{parameters.WithCache}}', true) - - ${{if eq(parameters.WithCache, true)}}: + - task: Cache@2 + inputs: + ${{if eq(variables['Build.SourceBranchName'], 'merge')}}: + key: ' "${{parameters.TODAY}}" | ${{parameters.AdditionalKey}} | merge ' + ${{else}}: + key: '"${{parameters.TODAY}}" | ${{parameters.AdditionalKey}} | $(Build.SourceVersion) ' + path: ${{parameters.CacheDir}} + restoreKeys: | + "${{parameters.TODAY}}" | ${{parameters.AdditionalKey}} + displayName: Cache Task - script: | set -e -x pushd '$(Build.SourcesDirectory)/cmake/external/emsdk' 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 81319e07c6..168602a179 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 @@ -759,7 +759,7 @@ stages: - template: ../nuget/templates/test_linux.yml parameters: - AgentPool : onnxruntime-Ubuntu2004-AMD-CPU + AgentPool : onnxruntime-Ubuntu2204-AMD-CPU NugetPackageName : 'Microsoft.ML.OnnxRuntime' ArtifactSuffix: 'CPU' SpecificArtifact: ${{ parameters.SpecificArtifact }} @@ -796,7 +796,7 @@ stages: OS: Linux BuildId: ${{ parameters.BuildId }} SpecificArtifact: ${{ parameters.SpecificArtifact }} - PoolName: 'onnxruntime-Ubuntu2004-AMD-CPU' + PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU' - template: final-jar-testing.yml parameters: diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-linux-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-linux-cpu.yml index 8538f15e93..cf470b3fa2 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-linux-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-linux-cpu.yml @@ -19,7 +19,7 @@ parameters: - name: PoolName type: string - default: 'onnxruntime-Ubuntu2004-AMD-CPU' + default: 'onnxruntime-Ubuntu2204-AMD-CPU' - name: ArtifactNamePrefix type: string diff --git a/tools/ci_build/github/azure-pipelines/templates/linux-ci.yml b/tools/ci_build/github/azure-pipelines/templates/linux-ci.yml index 7b9788d90b..15165e3cb0 100644 --- a/tools/ci_build/github/azure-pipelines/templates/linux-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/linux-ci.yml @@ -1,5 +1,5 @@ parameters: - AgentPool : 'onnxruntime-Ubuntu2004-AMD-CPU' + AgentPool : 'onnxruntime-Ubuntu2204-AMD-CPU' StageName : 'Linux_CI_Dev' RunDockerBuildArgs: '-o ubuntu20.04 -d cpu -x "--build_wheel"' NuPackScript: '' diff --git a/tools/ci_build/github/azure-pipelines/templates/linux-cpu-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/templates/linux-cpu-packaging-pipeline.yml index 6ad5f9f38a..8972d55f6e 100644 --- a/tools/ci_build/github/azure-pipelines/templates/linux-cpu-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/templates/linux-cpu-packaging-pipeline.yml @@ -32,7 +32,7 @@ stages: BaseImage: 'registry.access.redhat.com/ubi8/ubi' OnnxruntimeArch: 'x64' OnnxruntimeNodejsBindingArch: 'x64' - PoolName: 'onnxruntime-Ubuntu2004-AMD-CPU' + PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU' ArtifactNamePrefix: ${{ parameters.ArtifactNamePrefix }} PackageJava: ${{ parameters.PackageJava }} PackageNodeJS: ${{ parameters.PackageNodeJS }} diff --git a/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml b/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml index e6693a6f6d..d279e667f9 100644 --- a/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml @@ -13,7 +13,7 @@ parameters: - name: PoolName type: string - default: 'onnxruntime-Ubuntu2004-AMD-CPU' + default: 'onnxruntime-Ubuntu2204-AMD-CPU' - name: SkipPublish type: boolean 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 51583a25f6..cf39be23cb 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 @@ -336,7 +336,7 @@ stages: - template: ../nuget/templates/test_linux.yml parameters: - AgentPool : onnxruntime-Ubuntu2004-AMD-CPU + AgentPool : onnxruntime-Ubuntu2204-AMD-CPU NugetPackageName : 'Microsoft.ML.OnnxRuntime.Training' ArtifactSuffix: 'Training-CPU' StageSuffix: 'Training_CPU' diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-selectable-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-selectable-stage.yml index 00ba5ea4a4..01cab936aa 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-selectable-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-selectable-stage.yml @@ -48,7 +48,7 @@ stages: timeoutInMinutes: 90 workspace: clean: all - pool: onnxruntime-Ubuntu2004-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU strategy: matrix: ${{ each PythonVersion in parameters.python_version }}: 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 abe06e80f4..8669a883c3 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 @@ -430,7 +430,7 @@ stages: - template: py-linux.yml parameters: arch: 'x86_64' - machine_pool: 'onnxruntime-Ubuntu2004-AMD-CPU' + machine_pool: 'onnxruntime-Ubuntu2204-AMD-CPU' base_image: 'registry.access.redhat.com/ubi8/ubi' devtoolset_rootpath: /opt/rh/gcc-toolset-12/root ld_library_path_arg: /opt/rh/gcc-toolset-12/root/usr/lib64:/opt/rh/gcc-toolset-12/root/usr/lib:/opt/rh/gcc-toolset-12/root/usr/lib64/dyninst:/opt/rh/gcc-toolset-12/root/usr/lib/dyninst:/usr/local/lib64 @@ -443,6 +443,6 @@ stages: - template: py-linux-gpu.yml parameters: arch: 'x86_64' - machine_pool: 'onnxruntime-Ubuntu2004-AMD-CPU' + machine_pool: 'onnxruntime-Ubuntu2204-AMD-CPU' extra_build_arg: ${{ parameters.build_py_parameters }} cmake_build_type: ${{ parameters.cmake_build_type }} diff --git a/tools/ci_build/github/azure-pipelines/templates/rocm.yml b/tools/ci_build/github/azure-pipelines/templates/rocm.yml index 2e9e6c6b35..43a80aa4fd 100644 --- a/tools/ci_build/github/azure-pipelines/templates/rocm.yml +++ b/tools/ci_build/github/azure-pipelines/templates/rocm.yml @@ -14,7 +14,7 @@ jobs: workspace: clean: all timeoutInMinutes: 180 - pool: Ubuntu-2004-rocm-aiinfra + pool: Ubuntu-2204-rocm-aiinfra variables: - name: PythonVersion value: ${{ parameters.PythonVersion }} diff --git a/tools/ci_build/github/azure-pipelines/web-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/web-ci-pipeline.yml index e352a04068..24809ccfde 100644 --- a/tools/ci_build/github/azure-pipelines/web-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/web-ci-pipeline.yml @@ -53,7 +53,7 @@ stages: parameters: NpmPackagingMode: ${{ variables.NpmPackagingMode }} IsReleasePipeline: false - PoolName: 'onnxruntime-Ubuntu2004-AMD-CPU' + PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU' BuildStaticLib: true ExtraBuildArgs: $(ExtraBuildArgs) WASMTemplate: linux-wasm-ci.yml diff --git a/tools/ci_build/github/linux/build_linux_python_package.sh b/tools/ci_build/github/linux/build_linux_python_package.sh index 1059dd5047..933d1f3d58 100755 --- a/tools/ci_build/github/linux/build_linux_python_package.sh +++ b/tools/ci_build/github/linux/build_linux_python_package.sh @@ -7,9 +7,9 @@ mkdir -p /build/dist EXTRA_ARG="" -# Put 3.8 at the last because Ubuntu 20.04 use python 3.8 and we will upload the intermediate build files of this -# config to Azure DevOps Artifacts and download them to a Ubuntu 20.04 machine to run the tests. -PYTHON_EXES=("/opt/python/cp39-cp39/bin/python3.9" "/opt/python/cp310-cp310/bin/python3.10" "/opt/python/cp311-cp311/bin/python3.11" "/opt/python/cp312-cp312/bin/python3.12" "/opt/python/cp38-cp38/bin/python3.8") +# Put 3.8 at the last because Ubuntu 22.04 use python 3.10 and we will upload the intermediate build files of this +# config to Azure DevOps Artifacts and download them to a Ubuntu 22.04 machine to run the tests. +PYTHON_EXES=("/opt/python/cp38-cp38/bin/python3.8" "/opt/python/cp39-cp39/bin/python3.9" "/opt/python/cp311-cp311/bin/python3.11" "/opt/python/cp312-cp312/bin/python3.12" "/opt/python/cp310-cp310/bin/python3.10") while getopts "d:p:x:c:" parameter_Option do case "${parameter_Option}" in diff --git a/tools/ci_build/github/linux/run_python_tests.sh b/tools/ci_build/github/linux/run_python_tests.sh index 3164a10a09..082c561dd1 100755 --- a/tools/ci_build/github/linux/run_python_tests.sh +++ b/tools/ci_build/github/linux/run_python_tests.sh @@ -15,7 +15,7 @@ c) BUILD_CONFIG=${OPTARG};; esac done -export PATH=/opt/python/cp38-cp38/bin:$PATH +export PATH=/opt/python/cp310-cp310/bin:$PATH cd /build files=(whl/*.whl) FILE_NAME="${files[0]}"