Skip to content

Commit

Permalink
Upgrade Ubuntu CPU machine pools from 20.04 to 22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
snnn committed Jan 13, 2024
1 parent 443aeb8 commit 48fd2fc
Show file tree
Hide file tree
Showing 28 changed files with 35 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ stages:
workspace:
clean: all
timeoutInMinutes: 120
pool: onnxruntime-Ubuntu2004-AMD-CPU
pool: onnxruntime-Ubuntu2204-AMD-CPU
variables:
RocmVersion: '5.6'
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ stages:
OnnxruntimeCFlags: '-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -fcf-protection -O3 -Wl,--strip-all'
OnnxruntimeCXXFlags: '-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -fcf-protection -O3 -Wl,--strip-all'
OnnxruntimeNodejsBindingArch: 'x64'
PoolName: 'onnxruntime-Ubuntu2004-AMD-CPU'
PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU'
PackageJava: false
PackageNodeJS: false
# Nuget Packaging
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
AgentPool: 'onnxruntime-Ubuntu2004-AMD-CPU'
AgentPool: 'onnxruntime-Ubuntu2204-AMD-CPU'
ArtifactSuffix: ''
NugetPackageName : ''
StageSuffix: 'CPU'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stages:
timeoutInMinutes: 180
workspace:
clean: all
pool: onnxruntime-Ubuntu2004-AMD-CPU
pool: onnxruntime-Ubuntu2204-AMD-CPU

strategy:
matrix:
Expand Down
6 changes: 3 additions & 3 deletions tools/ci_build/github/azure-pipelines/post-merge-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stages:
dependsOn: []
jobs:
- job:
pool: 'onnxruntime-Ubuntu2004-AMD-CPU'
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
steps:
- checkout: none
- task: DownloadPipelineArtifact@2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ parameters:

- name: PoolName
type: string
default: 'onnxruntime-Ubuntu2004-AMD-CPU'
default: 'onnxruntime-Ubuntu2204-AMD-CPU'

- name: ArtifactNamePrefix
type: string
Expand Down
Original file line number Diff line number Diff line change
@@ -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: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:

- name: PoolName
type: string
default: 'onnxruntime-Ubuntu2004-AMD-CPU'
default: 'onnxruntime-Ubuntu2204-AMD-CPU'

- name: SkipPublish
type: boolean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/rocm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/web-ci-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 48fd2fc

Please sign in to comment.