From 250779474de0ce50f0ef4b39f7b050755e1019ba Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 28 Feb 2024 19:36:26 -0800 Subject: [PATCH] Change "onnxruntime-Linux-CPU-For-Android-CI" machine pool to "onnxruntime-Ubuntu2204-AMD-CPU" (#19698) ### Description The original one reports "out of disk space", which needs to be investigated. --- .../android-x86_64-crosscompile-ci-pipeline.yml | 6 +++--- .../azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml | 2 +- .../github/azure-pipelines/mac-react-native-ci-pipeline.yml | 2 +- .../templates/android-binary-size-check-stage.yml | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 9136b21aec62..d0a22aae0774 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -53,7 +53,7 @@ stages: Codeql.Enabled: false jobs: - job: Build_CPU_EP - pool: onnxruntime-Linux-CPU-For-Android-CI + pool: onnxruntime-Ubuntu2204-AMD-CPU workspace: clean: all timeoutInMinutes: 30 @@ -140,7 +140,7 @@ stages: jobs: - job: Build_NNAPI_EP - pool: onnxruntime-Linux-CPU-For-Android-CI + pool: onnxruntime-Ubuntu2204-AMD-CPU timeoutInMinutes: ${{ variables.JobsTimeout }} workspace: clean: all @@ -456,7 +456,7 @@ stages: variables: - name: skipComponentGovernanceDetection value: true - pool: 'onnxruntime-Linux-CPU-For-Android-CI' + pool: 'onnxruntime-Ubuntu2204-AMD-CPU' condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')) dependsOn: - NNAPI_EP_MASTER diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml index 1053a2518125..bbea7a0d114e 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml @@ -59,7 +59,7 @@ jobs: timeoutInMinutes: 120 workspace: clean: all - pool: onnxruntime-Linux-CPU-For-Android-CI + pool: onnxruntime-Ubuntu2204-AMD-CPU variables: ORT_CACHE_DIR: $(Pipeline.Workspace)/ort_ccache TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] diff --git a/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml index e8f4931d5ad9..886bacf5aac4 100644 --- a/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml @@ -61,4 +61,4 @@ stages: parameters: NpmPackagingMode: ${{ variables.NpmPackagingMode }} BuildConfig: 'Release' - PoolName: 'onnxruntime-Linux-CPU-For-Android-CI' + PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU' diff --git a/tools/ci_build/github/azure-pipelines/templates/android-binary-size-check-stage.yml b/tools/ci_build/github/azure-pipelines/templates/android-binary-size-check-stage.yml index 733cafdeeb8c..982295012711 100644 --- a/tools/ci_build/github/azure-pipelines/templates/android-binary-size-check-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/android-binary-size-check-stage.yml @@ -31,7 +31,7 @@ stages: timeoutInMinutes: 60 workspace: clean: all - pool: onnxruntime-Linux-CPU-For-Android-CI + pool: onnxruntime-Ubuntu2204-AMD-CPU steps: - checkout: self clean: true @@ -49,6 +49,7 @@ stages: - task: PythonScript@0 displayName: 'Set variables from config file "${{ parameters.BuildConfigFile }}"' inputs: + pythonInterpreter: /usr/bin/python3 scriptSource: inline script: | import json